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

Commit 02124666 authored by Sudheer Shanka's avatar Sudheer Shanka
Browse files

Pass in the correct binder token when calling AMS.finishReceiver(). 

Bug: 278795140
Test: atest services/tests/mockingservicestests/src/com/android/server/am/BroadcastQueueTest.java
Test: atest services/tests/mockingservicestests/src/com/android/server/am/BroadcastQueueModernImplTest.java
Change-Id: I51e2933411e15b9dd78cae2b4ad7234b96dc9122
parent 67b4d4bb

core/java/android/app/LoadedApk.java

+7 −3
Original line number Diff line number Diff line
@@ -1668,10 +1668,13 @@ public final class LoadedApk { 
    static final class ReceiverDispatcher {



        final static class InnerReceiver extends IIntentReceiver.Stub {

            final IApplicationThread mApplicationThread;

            final WeakReference<LoadedApk.ReceiverDispatcher> mDispatcher;

            final LoadedApk.ReceiverDispatcher mStrongRef;



            InnerReceiver(LoadedApk.ReceiverDispatcher rd, boolean strong) {

            InnerReceiver(IApplicationThread thread, LoadedApk.ReceiverDispatcher rd,

                    boolean strong) {

                mApplicationThread = thread;

                mDispatcher = new WeakReference<LoadedApk.ReceiverDispatcher>(rd);

                mStrongRef = strong ? rd : null;

            }
@@ -1718,7 +1721,8 @@ public final class LoadedApk { 
                        if (extras != null) {

                            extras.setAllowFds(false);

                        }

                        mgr.finishReceiver(this, resultCode, data, extras, false, intent.getFlags());

                        mgr.finishReceiver(mApplicationThread.asBinder(), resultCode, data,

                                extras, false, intent.getFlags());

                    } catch (RemoteException e) {

                        throw e.rethrowFromSystemServer();

                    }
@@ -1825,7 +1829,7 @@ public final class LoadedApk { 
            }



            mAppThread = appThread;

            mIIntentReceiver = new InnerReceiver(this, !registered);

            mIIntentReceiver = new InnerReceiver(mAppThread, this, !registered);

            mReceiver = receiver;

            mContext = context;

            mActivityThread = activityThread;