Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85c224c2 authored by Devin Moore's avatar Devin Moore Committed by Automerger Merge Worker
Browse files

Merge "Move BaseInterface typedef from protected to public" am: 96fcd27e am: af1e289f 

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



Change-Id: I43d54f5499010c4ecbab4709f25a4faa916a7493
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ad3a1998 af1e289f

libs/binder/include/binder/IInterface.h

+2 −2
Original line number Diff line number Diff line
@@ -72,9 +72,9 @@ class BnInterface : public INTERFACE, public BBinder 
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 @@ class BpInterface : public INTERFACE, public BpRefBase 
{

public:

    explicit                    BpInterface(const sp<IBinder>& remote);

    typedef INTERFACE BaseInterface;



protected:

    typedef INTERFACE           BaseInterface;

    virtual IBinder*            onAsBinder();

};