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

Commit 10b7474b authored by Aaron Liu's avatar Aaron Liu Committed by Automerger Merge Worker
Browse files

Merge "[Multiple Users] Start activity as system user." into tm-dev am: 2c152dd1 

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



Change-Id: I5589a90ac987bfbdb7c3f1eb027da068016a2346
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 298ff18a 2c152dd1

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

+22 −5
Original line number Diff line number Diff line
@@ -1707,7 +1707,7 @@ public class CentralSurfaces extends CoreStartable implements 
            @Nullable ActivityLaunchAnimator.Controller animationController,

            boolean showOverLockscreenWhenLocked) {

        startActivity(intent, dismissShade, animationController, showOverLockscreenWhenLocked,

                UserHandle.CURRENT);

                getActivityUserHandle(intent));

    }



    @Override
@@ -1794,7 +1794,7 @@ public class CentralSurfaces extends CoreStartable implements 
    public void startActivity(Intent intent, boolean dismissShade, Callback callback) {

        startActivityDismissingKeyguard(intent, false, dismissShade,

                false /* disallowEnterPictureInPictureWhileLaunching */, callback, 0,

                null /* animationController */, UserHandle.CURRENT);

                null /* animationController */, getActivityUserHandle(intent));

    }



    public void setQsExpanded(boolean expanded) {
@@ -2424,7 +2424,7 @@ public class CentralSurfaces extends CoreStartable implements 
            boolean dismissShade, int flags) {

        startActivityDismissingKeyguard(intent, onlyProvisioned, dismissShade,

                false /* disallowEnterPictureInPictureWhileLaunching */, null /* callback */,

                flags, null /* animationController */, UserHandle.CURRENT);

                flags, null /* animationController */, getActivityUserHandle(intent));

    }



    public void startActivityDismissingKeyguard(final Intent intent, boolean onlyProvisioned,
@@ -2867,7 +2867,7 @@ public class CentralSurfaces extends CoreStartable implements 
                                null /* callback */,

                                0 /* flags */,

                                animationController,

                                UserHandle.CURRENT),

                                getActivityUserHandle(intent)),

                delay);

    }
@@ -3601,7 +3601,8 @@ public class CentralSurfaces extends CoreStartable implements 
                mLaunchEmergencyActionWhenFinishedWaking = false;

                Intent emergencyIntent = getEmergencyActionIntent();

                if (emergencyIntent != null) {

                    mContext.startActivityAsUser(emergencyIntent, UserHandle.CURRENT);

                    mContext.startActivityAsUser(emergencyIntent,

                            getActivityUserHandle(emergencyIntent));

                }

            }

            updateScrimController();
@@ -4499,4 +4500,20 @@ public class CentralSurfaces extends CoreStartable implements 
        @Override

        public void dispatchDemoCommand(String command, Bundle args) { }

    };



    /**

     *  Determines what UserHandle to use when launching an activity.

     *

     *  We want to ensure that activities that are launched within the systemui process should be

     *  launched as user of the current process.

     * @param intent

     * @return UserHandle

     */

    private UserHandle getActivityUserHandle(Intent intent) {

        if (intent.getComponent() != null

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

            return new UserHandle(UserHandle.myUserId());

        }

        return UserHandle.CURRENT;

    }

}