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

Commit 34b88d6f authored by Eugene Susla's avatar Eugene Susla Committed by android-build-merger
Browse files

Merge "Merge "[Companion] Fix notification access dialog being in new task"... 

Merge "Merge "[Companion] Fix notification access dialog being in new task" into oc-dev am: 2eacbac8 am: 7688cbc1" into oc-dr1-dev-plus-aosp
am: 0da46137

Change-Id: I3255e43713c84d961be6b13eb05d1dad34937739
parents 1610ed43 0da46137

core/java/android/companion/CompanionDeviceManager.java

+4 −2
Original line number Diff line number Diff line
@@ -214,10 +214,12 @@ public final class CompanionDeviceManager { 
            return;

        }

        try {

            mService.requestNotificationAccess(component).send();

            IntentSender intentSender = mService.requestNotificationAccess(component)

                    .getIntentSender();

            mContext.startIntentSender(intentSender, null, 0, 0, 0);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        } catch (PendingIntent.CanceledException e) {

        } catch (IntentSender.SendIntentException e) {

            throw new RuntimeException(e);

        }

    }