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

Commit 2349481d authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

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

parents c695e448 d664269d
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);