commit 85c224c27a185488a6fe845e347991a617b5d920
author Devin Moore <devinmoore@google.com> Fri Jun 24 15:19:46 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jun 24 15:19:46 2022 +0000
tree 30332c11949db7f41b9fe568e3e27e44ae77b4e5
parent ad3a19985dcb7cd8bc76ce203b26b28765112bf4
parent af1e289f744ca003847287c5ac14a314bcd7ef18

Merge "Move BaseInterface typedef from protected to public" am: 96fcd27e59 am: af1e289f74

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2133628

Change-Id: I43d54f5499010c4ecbab4709f25a4faa916a7493
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

libs/binder/include/binder/IInterface.h

diff --git a/libs/binder/include/binder/IInterface.h b/libs/binder/include/binder/IInterface.h
index 7067830..9f7e2c8 100644
--- a/libs/binder/include/binder/IInterface.h
+++ b/libs/binder/include/binder/IInterface.h
@@ -72,9 +72,9 @@
 public:
     virtual sp<IInterface>      queryLocalInterface(const String16& _descriptor);
     virtual const String16&     getInterfaceDescriptor() const;
+    typedef INTERFACE BaseInterface;
 
 protected:
-    typedef INTERFACE           BaseInterface;
     virtual IBinder*            onAsBinder();
 };
 
@@ -85,9 +85,9 @@
 {
 public:
     explicit                    BpInterface(const sp<IBinder>& remote);
+    typedef INTERFACE BaseInterface;
 
 protected:
-    typedef INTERFACE           BaseInterface;
     virtual IBinder*            onAsBinder();
 };