commit 28a7564a9eaea06ab589512a92d8beb944cb05c5
author Steven Moreland <smoreland@google.com> Fri Jun 24 22:01:27 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jun 24 22:01:27 2022 +0000
tree b301b070fdb9428474601fe6ee9417cc675a5d69
parent 96fcd27e59570559103249d1d9312b0b43528371
parent c8490879af989a5fc0af5b14830c1c19eee1679d

Merge "libbinder: fix hanging wait in RpcSession"

libs/binder/include/binder/IInterface.h

diff --git a/libs/binder/include/binder/IInterface.h b/libs/binder/include/binder/IInterface.h
index f295417..e864f9e 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();
 };