Merge "Update device entry intent on keyguard vis change" into sc-dev
This commit is contained in:
@@ -2842,6 +2842,11 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
|
|||||||
mSecureCameraLaunched = false;
|
mSecureCameraLaunched = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (mKeyguardBypassController != null) {
|
||||||
|
// LS visibility has changed, so reset deviceEntryIntent
|
||||||
|
mKeyguardBypassController.setUserHasDeviceEntryIntent(false);
|
||||||
|
}
|
||||||
|
|
||||||
for (int i = 0; i < mCallbacks.size(); i++) {
|
for (int i = 0; i < mCallbacks.size(); i++) {
|
||||||
KeyguardUpdateMonitorCallback cb = mCallbacks.get(i).get();
|
KeyguardUpdateMonitorCallback cb = mCallbacks.get(i).get();
|
||||||
if (cb != null) {
|
if (cb != null) {
|
||||||
|
|||||||
Reference in New Issue
Block a user