From 09e2556c9a33bdedb975daae6c03757d973477ac Mon Sep 17 00:00:00 2001 From: zhouwenjie Date: Tue, 18 Jun 2019 16:58:33 -0700 Subject: [PATCH 1/2] Allow permission controller to start background activities Bug: 130827484 Test: Flash locally and run bugreport api with ag/7904826 reverted - without this change, a notification showed up and logcat has a warning mesage - with this change, a dialog popped up instead Change-Id: Ia7930abff2f1875016c7e289bd74e1a133559831 --- .../java/com/android/server/incident/PendingReports.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/incident/PendingReports.java b/services/core/java/com/android/server/incident/PendingReports.java index c45a904ad8b88..9fcbab71519de 100644 --- a/services/core/java/com/android/server/incident/PendingReports.java +++ b/services/core/java/com/android/server/incident/PendingReports.java @@ -17,6 +17,7 @@ package com.android.server.incident; import android.app.AppOpsManager; +import android.app.BroadcastOptions; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -358,10 +359,12 @@ class PendingReports { private void sendBroadcast(ComponentName receiver, int primaryUser) { final Intent intent = new Intent(Intent.ACTION_PENDING_INCIDENT_REPORTS_CHANGED); intent.setComponent(receiver); + final BroadcastOptions options = BroadcastOptions.makeBasic(); + options.setBackgroundActivityStartsAllowed(true); // Send it to the primary user. mContext.sendBroadcastAsUser(intent, UserHandle.getUserHandleForUid(primaryUser), - android.Manifest.permission.APPROVE_INCIDENT_REPORTS); + android.Manifest.permission.APPROVE_INCIDENT_REPORTS, options.toBundle()); } /** From 46a44912531b6748d2121eafb7e5447addb6436b Mon Sep 17 00:00:00 2001 From: Wenjie Zhou Date: Wed, 19 Jun 2019 17:35:49 +0000 Subject: [PATCH 2/2] Revert "Whitelist START_ACTIVITIES_FROM_BACKGROUND permission for" This reverts commit 0999f93e4a00a7991d13cfca185e99b9fbecbc38. Reason for revert: There is a better choice (ag/8051966) than adding the permission to resolve b/130827484 Bug: 130827484 Change-Id: I1b8fd74a173d4b0ef981e51f7e0a9c5f84d5f416 --- data/etc/privapp-permissions-platform.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml index c023e85394f2d..a640122f2b327 100644 --- a/data/etc/privapp-permissions-platform.xml +++ b/data/etc/privapp-permissions-platform.xml @@ -119,8 +119,6 @@ applications that come with the platform - -