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

Commit c2834f88 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "libbinder: eliminate Binder.cpp dependency on IShellCallback" am: 05f897ca am: 206aabd8 

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



Change-Id: I56fe6cd843de18d8ca13999c4552f14f1ae0a40b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6afdd442 206aabd8

libs/binder/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ cc_defaults { 
        "FdTrigger.cpp",

        "IInterface.cpp",

        "IResultReceiver.cpp",

        "IShellCallback.cpp",

        "OS.cpp",

        "Parcel.cpp",

        "ParcelFileDescriptor.cpp",
@@ -234,6 +233,7 @@ cc_library { 


    srcs: [

        "IMemory.cpp",

        "IShellCallback.cpp",

        "LazyServiceRegistrar.cpp",

        "MemoryBase.cpp",

        "MemoryDealer.cpp",

libs/binder/Binder.cpp

+4 −3
Original line number Diff line number Diff line
@@ -648,12 +648,13 @@ status_t BBinder::onTransact( 
            for (int i = 0; i < argc && data.dataAvail() > 0; i++) {

               args.add(data.readString16());

            }

            sp<IShellCallback> shellCallback = IShellCallback::asInterface(

                    data.readStrongBinder());

            sp<IBinder> shellCallbackBinder = data.readStrongBinder();

            sp<IResultReceiver> resultReceiver = IResultReceiver::asInterface(

                    data.readStrongBinder());



            // XXX can't add virtuals until binaries are updated.

            // sp<IShellCallback> shellCallback = IShellCallback::asInterface(

            //        shellCallbackBinder);

            // return shellCommand(in, out, err, args, resultReceiver);

            (void)in;

            (void)out;