From e679e7360608e9cf4470324a10e74bdb1eac9439 Mon Sep 17 00:00:00 2001 From: Evan Severson Date: Fri, 8 Apr 2022 16:04:19 -0700 Subject: [PATCH] Start SystemUI SensorUse activity as user 0 SystemUI runs as user 0, we shouldn't be spawning new instances in other users. Bug: 227350805 Test: Manual Change-Id: Ifd7c810ddbdb0c623a4f09d858ced1b7c814482b --- packages/SystemUI/AndroidManifest.xml | 6 ++++-- .../android/server/sensorprivacy/SensorPrivacyService.java | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml index eb7fea3eb89ac..b3d3008fb4ea6 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml @@ -522,7 +522,8 @@ android:launchMode="singleTop" android:permission="android.permission.MANAGE_SENSOR_PRIVACY" android:theme="@style/Theme.SystemUI.Dialog.Alert" - android:finishOnCloseSystemDialogs="true"> + android:finishOnCloseSystemDialogs="true" + android:showForAllUsers="true"> @@ -531,7 +532,8 @@ android:launchMode="singleTop" android:permission="android.permission.MANAGE_SENSOR_PRIVACY" android:theme="@style/BottomSheet" - android:finishOnCloseSystemDialogs="true"> + android:finishOnCloseSystemDialogs="true" + android:showForAllUsers="true"> diff --git a/services/core/java/com/android/server/sensorprivacy/SensorPrivacyService.java b/services/core/java/com/android/server/sensorprivacy/SensorPrivacyService.java index bce1cce0f47ff..08344170b02da 100644 --- a/services/core/java/com/android/server/sensorprivacy/SensorPrivacyService.java +++ b/services/core/java/com/android/server/sensorprivacy/SensorPrivacyService.java @@ -560,7 +560,7 @@ public final class SensorPrivacyService extends SystemService { + " sensors"); return; } - mContext.startActivityAsUser(dialogIntent, options.toBundle(), info.mUser); + mContext.startActivityAsUser(dialogIntent, options.toBundle(), UserHandle.SYSTEM); } /**