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

Merge "Properly handle pending intent for multi-user" into tm-dev

Browse Source
This commit is contained in:
Evan Chen
2022-02-25 17:17:39 +00:00
committed by Android (Google) Code Review
parent 16853e9b84 ec712b7a99
commit cafcc80f5e
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/companion/java/com/android/server/companion/AssociationRequestsProcessor.java
View File

@@ -50,6 +50,7 @@ import android.os.Handler;
import android.os.Parcel;
import android.os.RemoteException;
import android.os.ResultReceiver;
import android.os.UserHandle;
import android.util.PackageUtils;
import android.util.Slog;
@@ -201,8 +202,10 @@ class AssociationRequestsProcessor {
// requests at the same time.
// If the application already has a pending association request, that PendingIntent
// will be cancelled.
pendingIntent = PendingIntent.getActivity(mContext, /*requestCode */ packageUid, intent,
FLAG_ONE_SHOT | FLAG_CANCEL_CURRENT | FLAG_IMMUTABLE);
pendingIntent = PendingIntent.getActivityAsUser(
mContext, /*requestCode */ packageUid, intent,
FLAG_ONE_SHOT | FLAG_CANCEL_CURRENT | FLAG_IMMUTABLE,
/* options= */ null, UserHandle.CURRENT);
} finally {
Binder.restoreCallingIdentity(token);
}