Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Pass in the correct binder token when calling AMS.finishReceiver()." into udc-dev

Browse Source
This commit is contained in:
Sudheer Shanka
2023-04-19 17:32:36 +00:00
committed by Android (Google) Code Review
parent ffd922ac5e 02124666e2
commit 0ffb527e5f
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/app/LoadedApk.java
View File

@@ -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;