commit 4dcf023690249f751f2da8fe977f2c4404aeab9a
author Steven Moreland <smoreland@google.com> Fri Feb 19 21:59:39 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 19 21:59:39 2021 +0000
tree 63f71a7f49c564d01a116347acf3e3d5b2094457
parent 3ff5ff6f4fe156f0d3aa8fd2862d2b66c35251ca
parent 6eaa51fd319865ce4f9e63bff78672de8a382e74

Merge "libbinder: computed DUMP_FLAG_PRIORITY_ALL"

libs/binder/BpBinder.cpp

diff --git a/libs/binder/BpBinder.cpp b/libs/binder/BpBinder.cpp
index bf4387a..ddda024 100644
--- a/libs/binder/BpBinder.cpp
+++ b/libs/binder/BpBinder.cpp
@@ -228,8 +228,9 @@
                 : Stability::getLocalLevel();
 
             if (CC_UNLIKELY(!Stability::check(category, required))) {
-                ALOGE("Cannot do a user transaction on a %s binder in a %s context.",
+                ALOGE("Cannot do a user transaction on a %s binder (%s) in a %s context.",
                     category.debugString().c_str(),
+                    String8(getInterfaceDescriptor()).c_str(),
                     Stability::levelString(required).c_str());
                 return BAD_TYPE;
             }

libs/binder/include/private/binder/binder_module.h

diff --git a/libs/binder/include/private/binder/binder_module.h b/libs/binder/include/private/binder/binder_module.h
index 5a719b8..1579199 100644
--- a/libs/binder/include/private/binder/binder_module.h
+++ b/libs/binder/include/private/binder/binder_module.h
@@ -88,10 +88,6 @@
 };
 #endif //BINDER_GET_FROZEN_INFO
 
-enum transaction_flags_ext {
-    TF_CLEAR_BUF = 0x20, /* clear buffer on txn complete */
-};
-
 #ifdef __cplusplus
 }   // namespace android
 #endif

libs/renderengine/OWNERS

diff --git a/libs/renderengine/OWNERS b/libs/renderengine/OWNERS
index 08cf2de..c478506 100644
--- a/libs/renderengine/OWNERS
+++ b/libs/renderengine/OWNERS
@@ -1,3 +1,5 @@
 alecmouri@google.com
+djsollen@google.com
 jreck@google.com
 lpy@google.com
+scroggo@google.com