Merge "Fix CDM.requestNotificationAccess() in profile."

This commit is contained in:
Eugene Susla
2020-08-31 19:31:20 +00:00
committed by Gerrit Code Review

View File

@@ -316,12 +316,14 @@ public class CompanionDeviceManagerService extends SystemService implements Bind
.toString()); .toString());
long identity = Binder.clearCallingIdentity(); long identity = Binder.clearCallingIdentity();
try { try {
return PendingIntent.getActivity(getContext(), return PendingIntent.getActivityAsUser(getContext(),
0 /* request code */, 0 /* request code */,
NotificationAccessConfirmationActivityContract.launcherIntent( NotificationAccessConfirmationActivityContract.launcherIntent(
userId, component, packageTitle), userId, component, packageTitle),
PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_ONE_SHOT PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_ONE_SHOT
| PendingIntent.FLAG_CANCEL_CURRENT); | PendingIntent.FLAG_CANCEL_CURRENT,
null /* options */,
new UserHandle(userId));
} finally { } finally {
Binder.restoreCallingIdentity(identity); Binder.restoreCallingIdentity(identity);
} }