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

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

Merge "Removing unecessary additional lock metadata from QuickSettings user... 

Merge "Removing unecessary additional lock metadata from QuickSettings user tile." into jb-mr1.1-dev
parents ab972a6d f7614fc7

core/java/com/android/internal/widget/LockPatternUtils.java

+0 −10
Original line number Diff line number Diff line
@@ -115,16 +115,6 @@ public class LockPatternUtils { 
     */

    public static final String KEYGUARD_SHOW_APPWIDGET = "showappwidget";



    /**

     * Options used to lock the device upon user switch.

     */

    public static final Bundle USER_SWITCH_LOCK_OPTIONS = new Bundle();



    static {

        USER_SWITCH_LOCK_OPTIONS.putBoolean(KEYGUARD_SHOW_USER_SWITCHER, true);

        USER_SWITCH_LOCK_OPTIONS.putBoolean(KEYGUARD_SHOW_SECURITY_CHALLENGE, true);

    }



    /**

     * The bit in LOCK_BIOMETRIC_WEAK_FLAGS to be used to indicate whether liveliness should

     * be used

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

+1 −2
Original line number Diff line number Diff line
@@ -305,8 +305,7 @@ class QuickSettings { 
                        (UserManager) mContext.getSystemService(Context.USER_SERVICE);

                if (um.getUsers(true).size() > 1) {

                    try {

                        WindowManagerGlobal.getWindowManagerService().lockNow(

                                LockPatternUtils.USER_SWITCH_LOCK_OPTIONS);

                        WindowManagerGlobal.getWindowManagerService().lockNow(null);

                    } catch (RemoteException e) {

                        Log.e(TAG, "Couldn't show user switcher", e);

                    }

policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewManager.java

+0 −6
Original line number Diff line number Diff line
@@ -243,12 +243,6 @@ public class KeyguardViewManager { 
        }



        if (options != null) {

            if (options.getBoolean(LockPatternUtils.KEYGUARD_SHOW_USER_SWITCHER)) {

                mKeyguardView.goToUserSwitcher();

            }

            if (options.getBoolean(LockPatternUtils.KEYGUARD_SHOW_SECURITY_CHALLENGE)) {

                mKeyguardView.showNextSecurityScreenIfPresent();

            }

            int widgetToShow = options.getInt(LockPatternUtils.KEYGUARD_SHOW_APPWIDGET,

                    AppWidgetManager.INVALID_APPWIDGET_ID);

            if (widgetToShow != AppWidgetManager.INVALID_APPWIDGET_ID) {

policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewMediator.java

+1 −4
Original line number Diff line number Diff line
@@ -315,10 +315,7 @@ public class KeyguardViewMediator { 
            // We need to force a reset of the views, since lockNow (called by

            // ActivityManagerService) will not reconstruct the keyguard if it is already showing.

            synchronized (KeyguardViewMediator.this) {

                Bundle options = new Bundle();

                options.putBoolean(LockPatternUtils.KEYGUARD_SHOW_USER_SWITCHER, true);

                options.putBoolean(LockPatternUtils.KEYGUARD_SHOW_SECURITY_CHALLENGE, true);

                resetStateLocked(options);

                resetStateLocked(null);

                adjustStatusBarLocked();

                // Disable face unlock when the user switches.

                KeyguardUpdateMonitor.getInstance(mContext).setAlternateUnlockEnabled(false);

services/java/com/android/server/am/ActivityManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -14168,7 +14168,7 @@ public final class ActivityManagerService extends ActivityManagerNative 














                // Once the internal notion of the active user has switched, we lock the device















                // with the option to show the user switcher on the keyguard.













                mWindowManager.lockNow(LockPatternUtils.USER_SWITCH_LOCK_OPTIONS);













                mWindowManager.lockNow(null);





























                final UserStartedState uss = mStartedUsers.get(userId);