Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "am-24a1d38b9196448ba01be8ca57067403"

Browse Source 
* changes:
  Merge "Revert "Whitelist START_ACTIVITIES_FROM_BACKGROUND permission for"" into qt-dev am: 269907a310 am: 9530705038 am: cd01c44e93
  Merge "Allow permission controller to start background activities" into qt-dev am: 574cbd1987 am: b67bcb731b am: 61b1464759
This commit is contained in:
Android Build Merger (Role)
2019-06-21 00:53:56 +00:00
committed by Android (Google) Code Review
parent f62b91043c 3d8103c5ca
commit 0660531df1
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/incident/PendingReports.java
View File

@@ -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());
}
/**