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

Commit 053ff3c7 authored by Adrian Roos's avatar Adrian Roos Committed by Android (Google) Code Review
Browse files

Merge "Auto dismiss lockscreen when switching to guest" into lmp-dev

parents 95f3bcdc be47b07b

packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java

+1 −1
Original line number Diff line number Diff line
@@ -648,7 +648,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { 
                        @Override

                        public void onUserSwitchComplete(int newUserId) throws RemoteException {

                            mHandler.sendMessage(mHandler.obtainMessage(MSG_USER_SWITCH_COMPLETE,

                                    newUserId));

                                    newUserId, 0));

                            mSwitchingUser = false;

                        }

                    });

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+8 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.content.ContentResolver; 
import android.content.Context;

import android.content.Intent;

import android.content.IntentFilter;

import android.content.pm.UserInfo;

import android.media.AudioManager;

import android.media.SoundPool;

import android.os.Bundle;
@@ -302,6 +303,13 @@ public class KeyguardViewMediator extends SystemUI { 
        @Override

        public void onUserSwitchComplete(int userId) {

            mSwitchingUser = false;

            if (userId != UserHandle.USER_OWNER) {

                UserInfo info = UserManager.get(mContext).getUserInfo(userId);

                if (info != null && info.isGuest()) {

                    // If we just switched to a guest, try to dismiss keyguard.

                    dismiss();

                }

            }

        }



        @Override