Merge "[Companion] Fix notification access dialog being in new task" into oc-dev

2017-06-20 22:22:54 +00:00
parent 59c6385bf9 d149a08544
commit 2eacbac8c3
1 changed files with 4 additions and 2 deletions
--- a/core/java/android/companion/CompanionDeviceManager.java
+++ b/core/java/android/companion/CompanionDeviceManager.java
@@ -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);
        }
    }