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

Commit f2184f34 authored by Eugene Susla's avatar Eugene Susla Committed by Automerger Merge Worker
Browse files

Merge "Fix CDM.requestNotificationAccess() in profile." am: ca576d4b am:... 

Merge "Fix CDM.requestNotificationAccess() in profile." am: ca576d4b am: 2a59e10d am: 67428624 am: b7d8dc70 am: 6066292e

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

Change-Id: I0a33afcddcb268ec5ce739dea4859fb1bafca800
parents 3c2fb008 6066292e

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

+4 −2
Original line number Diff line number Diff line
@@ -393,12 +393,14 @@ public class CompanionDeviceManagerService extends SystemService implements Bind 
                            .toString());

            long identity = Binder.clearCallingIdentity();

            try {

                return PendingIntent.getActivity(getContext(),

                return PendingIntent.getActivityAsUser(getContext(),

                        0 /* request code */,

                        NotificationAccessConfirmationActivityContract.launcherIntent(

                                userId, component, packageTitle),

                        PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_ONE_SHOT

                                | PendingIntent.FLAG_CANCEL_CURRENT);

                                | PendingIntent.FLAG_CANCEL_CURRENT,

                        null /* options */,

                        new UserHandle(userId));

            } finally {

                Binder.restoreCallingIdentity(identity);

            }