Snap for 8756029 from 1893fa01508964ae228c523607904d0b79e1354d to mainline-go-sdkext-releaseaml_go_sdk_330810000android13-mainline-go-sdkext-release

Change-Id: I3c75acd978ab24f6b58c46f7f8512e7e7955aa0a

6 files changed, 8 insertions, 64 deletions

diff --git a/cmds/atrace/atrace.rc b/cmds/atrace/atrace.rc
index 5267b0294c..32ffe142cf 100644
--- a/cmds/atrace/atrace.rc
+++ b/cmds/atrace/atrace.rc
@@ -294,9 +294,12 @@ on late-init
     write /sys/kernel/tracing/synthetic_events "rss_stat_throttled unsigned int mm_id; unsigned int curr; int member; long size"
     write /sys/kernel/debug/tracing/synthetic_events "rss_stat_throttled unsigned int mm_id; unsigned int curr; int member; long size"
 
-    # allow creating event triggers
-    chmod 0666 /sys/kernel/debug/tracing/events/kmem/rss_stat/trigger
+# Set up histogram triggers
+    # rss_stat_throttled (bucket size == 512KB)
     chmod 0666 /sys/kernel/tracing/events/kmem/rss_stat/trigger
+    chmod 0666 /sys/kernel/debug/tracing/events/kmem/rss_stat/trigger
+    write /sys/kernel/tracing/events/kmem/rss_stat/trigger "hist:keys=mm_id,member:bucket=size/0x80000:onchange($$bucket).rss_stat_throttled(mm_id,curr,member,size)"
+    write /sys/kernel/debug/tracing/events/kmem/rss_stat/trigger "hist:keys=mm_id,member:bucket=size/0x80000:onchange($$bucket).rss_stat_throttled(mm_id,curr,member,size)"
 
 # Only create the tracing instance if persist.mm_events.enabled
 # Attempting to remove the tracing instance after it has been created
diff --git a/services/powermanager/WorkSource.cpp b/services/powermanager/WorkSource.cpp
index 64a5499084..1006a0666f 100644
--- a/services/powermanager/WorkSource.cpp
+++ b/services/powermanager/WorkSource.cpp
@@ -28,16 +28,9 @@ status_t WorkSource::readFromParcel(const android::Parcel *parcel) {
         return BAD_VALUE;
     }
     int32_t num;
-    int32_t workChainCount;
     status_t ret = parcel->readInt32(&num)
                 ?: parcel->readInt32Vector(&mUids)
-                ?: parcel->readString16Vector(&mNames)
-                ?: parcel->readInt32(&workChainCount);
-
-    if (ret == OK && workChainCount > 0) {
-        // We don't yet support WorkChains in native WorkSources.
-        return BAD_VALUE;
-    }
+                ?: parcel->readString16Vector(&mNames);
 
     return ret;
 }
@@ -50,8 +43,7 @@ status_t WorkSource::writeToParcel(android::Parcel *parcel) const {
 
     return parcel->writeInt32(mUids.size())
         ?: parcel->writeInt32Vector(mUids)
-        ?: parcel->writeString16Vector(mNames)
-        ?: parcel->writeInt32(-1);
+        ?: parcel->writeString16Vector(mNames);
 }
 
 } // namespace android::os
diff --git a/services/powermanager/tests/Android.bp b/services/powermanager/tests/Android.bp
index 962784cbae..2d1558a33f 100644
--- a/services/powermanager/tests/Android.bp
+++ b/services/powermanager/tests/Android.bp
@@ -31,7 +31,6 @@ cc_test {
         "PowerHalWrapperAidlTest.cpp",
         "PowerHalWrapperHidlV1_0Test.cpp",
         "PowerHalWrapperHidlV1_1Test.cpp",
-        "WorkSourceTest.cpp",
     ],
     cflags: [
         "-Wall",
diff --git a/services/powermanager/tests/WorkSourceTest.cpp b/services/powermanager/tests/WorkSourceTest.cpp
deleted file mode 100644
index bb9164ac57..0000000000
--- a/services/powermanager/tests/WorkSourceTest.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2022 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <optional>
-#define LOG_TAG "PowerHalLoaderTest"
-
-#include <android-base/logging.h>
-#include <android/WorkSource.h>
-#include <binder/Parcel.h>
-#include <gtest/gtest.h>
-
-#include <future>
-
-using namespace android;
-using namespace testing;
-
-TEST(WorkSourceTest, Parcel) {
-    std::vector<int32_t> uids = {1, 2};
-    using Names = std::vector<std::optional<String16>>;
-    std::optional<Names> names = std::make_optional<Names>({std::make_optional(String16("name"))});
-    os::WorkSource ws{uids, names};
-
-    Parcel p;
-    ws.writeToParcel(&p);
-    p.setDataPosition(0);
-
-    os::WorkSource otherWs;
-    otherWs.readFromParcel(&p);
-
-    EXPECT_EQ(ws, otherWs);
-    EXPECT_EQ(uids, otherWs.getUids());
-    EXPECT_EQ(names, otherWs.getNames());
-}
diff --git a/services/surfaceflinger/BufferStateLayer.cpp b/services/surfaceflinger/BufferStateLayer.cpp
index 3875f151cb..fecf5ae059 100644
--- a/services/surfaceflinger/BufferStateLayer.cpp
+++ b/services/surfaceflinger/BufferStateLayer.cpp
@@ -34,8 +34,6 @@
 #include "FrameTracer/FrameTracer.h"
 #include "TimeStats/TimeStats.h"
 
-#define EARLY_RELEASE_ENABLED false
-
 namespace android {
 
 using PresentState = frametimeline::SurfaceFrame::PresentState;
@@ -375,7 +373,7 @@ bool BufferStateLayer::setBuffer(std::shared_ptr<renderengine::ExternalTexture>&
               addSurfaceFrameDroppedForBuffer(mDrawingState.bufferSurfaceFrameTX);
               mDrawingState.bufferSurfaceFrameTX.reset();
             }
-        } else if (EARLY_RELEASE_ENABLED && mLastClientCompositionFence != nullptr) {
+        } else if (mLastClientCompositionFence != nullptr) {
             callReleaseBufferCallback(mDrawingState.releaseBufferListener,
                                       mDrawingState.buffer->getBuffer(), mDrawingState.frameNumber,
                                       mLastClientCompositionFence,
diff --git a/services/surfaceflinger/Scheduler/VsyncSchedule.cpp b/services/surfaceflinger/Scheduler/VsyncSchedule.cpp
index 3a918a1660..e611658bfd 100644
--- a/services/surfaceflinger/Scheduler/VsyncSchedule.cpp
+++ b/services/surfaceflinger/Scheduler/VsyncSchedule.cpp
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-#define ATRACE_TAG ATRACE_TAG_GRAPHICS
-
 #include <scheduler/Fps.h>
 #include <scheduler/Timer.h>