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

Merge "[MultiUser] Ensure sysyuig activities use user 0" into tm-dev am: e5b570be58 am: 500315e81b am: cd8ffe5fe8

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

Change-Id: I6a383cc2d0a62b069b2c2191d9d9f93782d7106b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Aaron Liu
2022-04-27 21:51:36 +00:00
committed by Automerger Merge Worker
parent ef9b74f1b1 cd8ffe5fe8
commit 453237d780
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/res/values/config.xml
View File

@@ -714,4 +714,10 @@
<item>@*android:string/status_bar_alarm_clock</item>
<item>@*android:string/status_bar_call_strength</item>
</string-array>
<!-- Packages of SystemUI -->
<string-array name="system_ui_packages" translatable="false">
<item>com.android.keyguard</item>
<item>com.android.systemui</item>
</string-array>
</resources>

9
packages/SystemUI/src/com/android/systemui/statusbar/phone/CentralSurfaces.java
View File

@@ -4547,9 +4547,12 @@ public class CentralSurfaces extends CoreStartable implements
* @return UserHandle
*/
private UserHandle getActivityUserHandle(Intent intent) {
if (intent.getComponent() != null
&& mContext.getPackageName().equals(intent.getComponent().getPackageName())) {
return new UserHandle(UserHandle.myUserId());
String[] packages = mContext.getResources().getStringArray(R.array.system_ui_packages);
for (String pkg : packages) {
if (intent.getComponent() == null) break;
if (pkg.equals(intent.getComponent().getPackageName())) {
return new UserHandle(UserHandle.myUserId());
}
}
return UserHandle.CURRENT;
}