diff options
| author | 2022-04-14 00:07:39 +0000 | |
|---|---|---|
| committer | 2022-04-14 00:07:39 +0000 | |
| commit | 6ec1172f3e651949fdbf8372236d968c86482533 (patch) | |
| tree | 1c7d75d9b02c110b6fd6543426acccd382cb64b9 | |
| parent | 759d76068b682fa6ebcb9d4d2879c6d1af5acc0f (diff) | |
| parent | e679e7360608e9cf4470324a10e74bdb1eac9439 (diff) | |
Merge "Start SystemUI SensorUse activity as user 0" into tm-dev
| -rw-r--r-- | packages/SystemUI/AndroidManifest.xml | 6 | ||||
| -rw-r--r-- | services/core/java/com/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 6d7172ec0fbe..6887d037c6f4 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml @@ -523,7 +523,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"> </activity> <!-- started from SensoryPrivacyService --> @@ -532,7 +533,8 @@ android:launchMode="singleTop" android:permission="android.permission.MANAGE_SENSOR_PRIVACY" android:theme="@style/BottomSheet" - android:finishOnCloseSystemDialogs="true"> + android:finishOnCloseSystemDialogs="true" + android:showForAllUsers="true"> </activity> diff --git a/services/core/java/com/android/server/sensorprivacy/SensorPrivacyService.java b/services/core/java/com/android/server/sensorprivacy/SensorPrivacyService.java index bce1cce0f47f..08344170b02d 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); } /** |