--- KeyguardViewMediator.java 2011-09-29 16:31:01.938287668 +0800
+++ KeyguardViewMediator.java.bk 2011-09-27 17:17:51.710301823 +0800
@@ -172,9 +172,7 @@
/**
* External apps (like the phone app) can tell us to disable the keygaurd.
*/
- /*Jiujin.hong 2011 0927*/
- /*private boolean mExternallyEnabled = true;default*/
- private boolean mExternallyEnabled = false;
+ private boolean mExternallyEnabled = true;
/**
* Remember if an external call to {@link #setKeyguardEnabled} with value
@@ -371,12 +369,9 @@
mExitSecureCallback.onKeyguardExitResult(false);
mExitSecureCallback = null;
resetStateLocked();
- /*Jiujin.hong 2011/0929*/
- hideLocked();/*End*/
} else {
showLocked();
- /*Jiujin.hong 2011/0929*/
- hideLocked();/*End*/
+
// block until we know the keygaurd is done drawing (and post a message
// to unblock us after a timeout so we don't risk blocking too long
// and causing an ANR).
+++ KeyguardViewMediator.java.bk 2011-09-27 17:17:51.710301823 +0800
@@ -172,9 +172,7 @@
/**
* External apps (like the phone app) can tell us to disable the keygaurd.
*/
- /*Jiujin.hong 2011 0927*/
- /*private boolean mExternallyEnabled = true;default*/
- private boolean mExternallyEnabled = false;
+ private boolean mExternallyEnabled = true;
/**
* Remember if an external call to {@link #setKeyguardEnabled} with value
@@ -371,12 +369,9 @@
mExitSecureCallback.onKeyguardExitResult(false);
mExitSecureCallback = null;
resetStateLocked();
- /*Jiujin.hong 2011/0929*/
- hideLocked();/*End*/
} else {
showLocked();
- /*Jiujin.hong 2011/0929*/
- hideLocked();/*End*/
+
// block until we know the keygaurd is done drawing (and post a message
// to unblock us after a timeout so we don't risk blocking too long
// and causing an ANR).