Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Keyguard: Don't lock on SIM removed during shutdown" into nyc-mr2-dev

Browse Source
This commit is contained in:
Adrian Roos
2016-12-27 23:20:43 +00:00
committed by Android (Google) Code Review
parent cbb057d3da 1f8025adf2
commit 52133e6916
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
View File

@@ -203,6 +203,7 @@ public class KeyguardViewMediator extends SystemUI {
private boolean mSystemReady; private boolean mSystemReady;
private boolean mBootCompleted; private boolean mBootCompleted;
private boolean mBootSendUserPresent; private boolean mBootSendUserPresent;
private boolean mShuttingDown;
/** High level access to the power manager for WakeLocks */ /** High level access to the power manager for WakeLocks */
private PowerManager mPM; private PowerManager mPM;
@@ -497,7 +498,7 @@ public class KeyguardViewMediator extends SystemUI {
} }
private void onSimAbsentLocked() { private void onSimAbsentLocked() {
if (isSecure() && mLockWhenSimRemoved) { if (isSecure() && mLockWhenSimRemoved && !mShuttingDown) {
mLockWhenSimRemoved = false; mLockWhenSimRemoved = false;
MetricsLogger.action(mContext, MetricsLogger.action(mContext,
MetricsEvent.ACTION_LOCK_BECAUSE_SIM_REMOVED, mShowing); MetricsEvent.ACTION_LOCK_BECAUSE_SIM_REMOVED, mShowing);
@@ -665,9 +666,11 @@ public class KeyguardViewMediator extends SystemUI {
mShowKeyguardWakeLock = mPM.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "show keyguard"); mShowKeyguardWakeLock = mPM.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "show keyguard");
mShowKeyguardWakeLock.setReferenceCounted(false); mShowKeyguardWakeLock.setReferenceCounted(false);
mContext.registerReceiver(mBroadcastReceiver, new IntentFilter(DELAYED_KEYGUARD_ACTION)); IntentFilter filter = new IntentFilter();
mContext.registerReceiver( filter.addAction(DELAYED_KEYGUARD_ACTION);
mBroadcastReceiver, new IntentFilter(DELAYED_LOCK_PROFILE_ACTION)); filter.addAction(DELAYED_LOCK_PROFILE_ACTION);
filter.addAction(Intent.ACTION_SHUTDOWN);
mContext.registerReceiver(mBroadcastReceiver, filter);
mKeyguardDisplayManager = new KeyguardDisplayManager(mContext); mKeyguardDisplayManager = new KeyguardDisplayManager(mContext);
@@ -1422,6 +1425,10 @@ public class KeyguardViewMediator extends SystemUI {
} }
} }
} }
} else if (Intent.ACTION_SHUTDOWN.equals(intent.getAction())) {
synchronized (KeyguardViewMediator.this){
mShuttingDown = true;
}
} }
} }
}; };
@@ -1984,6 +1991,7 @@ public class KeyguardViewMediator extends SystemUI {
pw.print(" mBootCompleted: "); pw.println(mBootCompleted); pw.print(" mBootCompleted: "); pw.println(mBootCompleted);
pw.print(" mBootSendUserPresent: "); pw.println(mBootSendUserPresent); pw.print(" mBootSendUserPresent: "); pw.println(mBootSendUserPresent);
pw.print(" mExternallyEnabled: "); pw.println(mExternallyEnabled); pw.print(" mExternallyEnabled: "); pw.println(mExternallyEnabled);
pw.print(" mShuttingDown: "); pw.println(mShuttingDown);
pw.print(" mNeedToReshowWhenReenabled: "); pw.println(mNeedToReshowWhenReenabled); pw.print(" mNeedToReshowWhenReenabled: "); pw.println(mNeedToReshowWhenReenabled);
pw.print(" mShowing: "); pw.println(mShowing); pw.print(" mShowing: "); pw.println(mShowing);
pw.print(" mInputRestricted: "); pw.println(mInputRestricted); pw.print(" mInputRestricted: "); pw.println(mInputRestricted);