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

Commit 0660531d authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge changes from topic "am-24a1d38b9196448ba01be8ca57067403" 

* changes:
  Merge "Revert "Whitelist START_ACTIVITIES_FROM_BACKGROUND permission for"" into qt-dev am: 269907a3 am: 95307050 am: cd01c44e
  Merge "Allow permission controller to start background activities" into qt-dev am: 574cbd19 am: b67bcb73 am: 61b14647
parents f62b9104 3d8103c5

services/core/java/com/android/server/incident/PendingReports.java

+4 −1
Original line number Diff line number Diff line
@@ -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());

    }



    /**