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

Commit c06ff0e9 authored by Evan Chen's avatar Evan Chen Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17003627

Change-Id: I7de4e493028ad75a911a54a47dcd88ba7fe80182
parents fcbd6de4 cafcc80f

services/companion/java/com/android/server/companion/AssociationRequestsProcessor.java

+5 −2
Original line number Diff line number Diff line
@@ -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);

        }