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

Commit fcc355ca authored by Evan Severson's avatar Evan Severson Committed by Automerger Merge Worker
Browse files

Merge "Do not tell app the user is leaving" into sc-dev am: 0c13593a 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15099851

Change-Id: Ib39db6f7c2fbbb587ebe81d45a2ceced05070e30
parents 42d3ad7f 0c13593a

services/core/java/com/android/server/SensorPrivacyService.java

+3 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import static android.app.AppOpsManager.OP_PHONE_CALL_MICROPHONE; 
import static android.app.AppOpsManager.OP_RECORD_AUDIO;

import static android.content.Intent.EXTRA_PACKAGE_NAME;

import static android.content.Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS;

import static android.content.Intent.FLAG_ACTIVITY_NO_USER_ACTION;

import static android.content.pm.PackageManager.PERMISSION_GRANTED;

import static android.hardware.SensorPrivacyManager.EXTRA_ALL_SENSORS;

import static android.hardware.SensorPrivacyManager.EXTRA_SENSOR;
@@ -519,7 +520,8 @@ public final class SensorPrivacyService extends SystemService { 
            options.setLaunchTaskId(info.mTaskId);

            options.setTaskOverlay(true, true);



            dialogIntent.addFlags(FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);

            dialogIntent.addFlags(

                    FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS | FLAG_ACTIVITY_NO_USER_ACTION);



            dialogIntent.putExtra(EXTRA_PACKAGE_NAME, info.mPackageName);

            if (sensors.size() == 1) {