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

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

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

Change-Id: I7e291b7033fcf693ef05ccd6f20eee7b0c476936
This commit is contained in:
Evan Severson
2021-07-01 15:58:01 +00:00
committed by Automerger Merge Worker
parent 25723dbfdd 0c13593a18
commit 155861c911
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/SensorPrivacyService.java
View File

@@ -30,6 +30,7 @@ import static android.app.AppOpsManager.OP_PHONE_CALL_MICROPHONE;
import static android.app.AppOpsManager.OP_RECORD_AUDIO; import static android.app.AppOpsManager.OP_RECORD_AUDIO;
import static android.content.Intent.EXTRA_PACKAGE_NAME; 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_EXCLUDE_FROM_RECENTS;
import static android.content.Intent.FLAG_ACTIVITY_NO_USER_ACTION;
import static android.content.pm.PackageManager.PERMISSION_GRANTED; import static android.content.pm.PackageManager.PERMISSION_GRANTED;
import static android.hardware.SensorPrivacyManager.EXTRA_ALL_SENSORS; import static android.hardware.SensorPrivacyManager.EXTRA_ALL_SENSORS;
import static android.hardware.SensorPrivacyManager.EXTRA_SENSOR; import static android.hardware.SensorPrivacyManager.EXTRA_SENSOR;
@@ -519,7 +520,8 @@ public final class SensorPrivacyService extends SystemService {
options.setLaunchTaskId(info.mTaskId); options.setLaunchTaskId(info.mTaskId);
options.setTaskOverlay(true, true); 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); dialogIntent.putExtra(EXTRA_PACKAGE_NAME, info.mPackageName);
if (sensors.size() == 1) { if (sensors.size() == 1) {