commit 69c0121d26a76405ba57449b10c7e4520e965c5f
author Ady Abraham <adyabr@google.com> Mon Mar 29 22:48:50 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 29 22:48:50 2021 +0000
tree af1a097c124ce8dff6d1f40dc54c116458c4ccc1
parent ce9e187a07547ddcb8e467a10f3549544bb65e1a
parent 38605fc3825897338fc284bbb79ee7557f3a6f07

Merge "Clarify that the buffer passed to ASurfaceTransaction_setBuffer needs to have AHARDWAREBUFFER_USAGE_GPU_SAMPLED_IMAGE." into sc-dev

libs/binder/Android.bp

diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp
index 274c3ae..144dbd3 100644
--- a/libs/binder/Android.bp
+++ b/libs/binder/Android.bp
@@ -73,6 +73,7 @@
     "PermissionController.cpp",
     "ProcessInfoService.cpp",
     "IpPrefix.cpp",
+    ":activity_manager_procstate_aidl",
 ]
 
 cc_library {
@@ -132,7 +133,6 @@
         "Utils.cpp",
         ":packagemanager_aidl",
         ":libbinder_aidl",
-        ":activity_manager_procstate_aidl",
     ],
 
     target: {

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 525b043..36b550b 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -3450,6 +3450,7 @@
         const bool acquireFenceChanged = (s.what & layer_state_t::eAcquireFenceChanged);
         if (acquireFenceChanged && s.acquireFence &&
             s.acquireFence->getStatus() == Fence::Status::Unsignaled) {
+            ATRACE_NAME("fence unsignaled");
             ready = false;
         }