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

Keyguard: Don't lock on SIM removed during shutdown am: 1f8025adf2

Browse Source 
am: c30dc190ba

Change-Id: Ic0b38d7d66f702241ee1d9df7e433076cc40485e
This commit is contained in:
Adrian Roos
2016-12-27 23:36:15 +00:00
committed by android-build-merger
parent 83fcc421c5 c30dc190ba
commit 58ffefa40f
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

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