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

Commit 500315e8 authored by Aaron Liu's avatar Aaron Liu Committed by Automerger Merge Worker
Browse files

Merge "[MultiUser] Ensure sysyuig activities use user 0" into tm-dev am: e5b570be 

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



Change-Id: I7157f573cd814123fe69e9de5e17653b7b4c2a07
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e9069b19 e5b570be

packages/SystemUI/res/values/config.xml

+6 −0
Original line number Diff line number Diff line
@@ -711,4 +711,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>

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

+6 −3
Original line number Diff line number Diff line
@@ -4531,10 +4531,13 @@ public class CentralSurfaces extends CoreStartable implements 
     * @return UserHandle

     */

    private UserHandle getActivityUserHandle(Intent intent) {

        if (intent.getComponent() != null

                && mContext.getPackageName().equals(intent.getComponent().getPackageName())) {

        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;

    }

}