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

Commit 1539f47e authored by Winson Chung's avatar Winson Chung Committed by android-build-merger
Browse files

Merge "Fix call to get the current user id from a secondary SystemUI process." into oc-dev

am: 2349481d

Change-Id: I65bea4faf799ea1b5d02ff1c4c514485f174ff1f
parents 5da64d33 2349481d
Loading
Loading
Loading
Loading
+6 −1
Original line number Diff line number Diff line
@@ -1029,7 +1029,12 @@ public class SystemServicesProxy {
     * Returns the current user id.
     */
    public int getCurrentUser() {
        return KeyguardUpdateMonitor.getCurrentUser();
        if (mAm == null) return 0;

        // This must call through ActivityManager, as the SystemServicesProxy can be called in a
        // secondary user's SystemUI process, and KeyguardUpdateMonitor is only updated in the
        // primary user's SystemUI process
        return mAm.getCurrentUser();
    }

    /**
+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ public class RecentsTaskLoadPlan {
        mCurrentQuietProfiles.clear();

        if (currentUserId == UserHandle.USER_CURRENT) {
            currentUserId = KeyguardUpdateMonitor.getCurrentUser();
            currentUserId = SystemServicesProxy.getInstance(mContext).getCurrentUser();
        }
        UserManager userManager = (UserManager) mContext.getSystemService(Context.USER_SERVICE);
        List<UserInfo> profiles = userManager.getProfiles(currentUserId);