commit a6e1c5dc277ff2661c59b7c26cf89b49bd30b48e
author Albert Chaulk <achaulk@google.com> Thu May 11 05:36:52 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu May 11 05:36:52 2017 +0000
tree 862706d062338cb323e2e2ce148c0feeaaa90da4
parent c6e9b955f48db33424750a96fd26ff514a5be7ec
parent 4ba6f990703f6bd83c5e8557951b9f01c77e0fd8

Merge "Surfaceflinger: Propagate type & UID from parent layers" into oc-dev
am: 4ba6f99070

Change-Id: Iefbb9bd3c578fe8d8662f7d35422f6f20b8110a1

services/surfaceflinger/Layer.cpp

diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp
index 8220d0a..b43b30d 100755
--- a/services/surfaceflinger/Layer.cpp
+++ b/services/surfaceflinger/Layer.cpp
@@ -697,7 +697,16 @@
             mName.string(), z, to_string(error).c_str(),
             static_cast<int32_t>(error));
 
-    error = hwcLayer->setInfo(s.type, s.appId);
+    int type = s.type;
+    int appId = s.appId;
+    sp<Layer> parent = mParent.promote();
+    if (parent.get()) {
+        auto& parentState = parent->getDrawingState();
+        type = parentState.type;
+        appId = parentState.appId;
+    }
+
+    error = hwcLayer->setInfo(type, appId);
     ALOGE_IF(error != HWC2::Error::None, "[%s] Failed to set info (%d)",
              mName.string(), static_cast<int32_t>(error));
 #else