Merge "Allow permission controller to start background activities" into qt-dev am: 574cbd1987 am: b67bcb731b

am: 61b1464759

Change-Id: I23b809501dfa52a278d254fc88e24241b1aa6f1a
This commit is contained in:
zhouwenjie
2019-06-20 17:52:21 -07:00
committed by android-build-merger

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