diff options
| author | 2022-07-08 21:49:08 +0000 | |
|---|---|---|
| committer | 2022-07-08 21:49:08 +0000 | |
| commit | c2834f88ca7b124a65a69d99a85d375092eaef9e (patch) | |
| tree | ac31526dbb4d5e523a80537684f7eeb0f18884c0 | |
| parent | 6afdd4428e76792bc656b4b0bf63f286bfd897a9 (diff) | |
| parent | 206aabd86ce00e78d223fb228b42294a2e289ae9 (diff) | |
Merge "libbinder: eliminate Binder.cpp dependency on IShellCallback" am: 05f897cae9 am: 206aabd86c
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2147029
Change-Id: I56fe6cd843de18d8ca13999c4552f14f1ae0a40b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libs/binder/Android.bp | 2 | ||||
| -rw-r--r-- | libs/binder/Binder.cpp | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/libs/binder/Android.bp b/libs/binder/Android.bp index 541ec37eec..441a4a8be4 100644 --- a/libs/binder/Android.bp +++ b/libs/binder/Android.bp @@ -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", diff --git a/libs/binder/Binder.cpp b/libs/binder/Binder.cpp index b9a8ba9651..532bacbdfe 100644 --- a/libs/binder/Binder.cpp +++ b/libs/binder/Binder.cpp @@ -648,13 +648,14 @@ 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. - //return shellCommand(in, out, err, args, resultReceiver); + // sp<IShellCallback> shellCallback = IShellCallback::asInterface( + // shellCallbackBinder); + // return shellCommand(in, out, err, args, resultReceiver); (void)in; (void)out; (void)err; |