diff options
| author | Brad Fitzpatrick <bradfitz@android.com> | 2010-10-21 07:39:10 -0700 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@android.com> | 2010-10-21 07:39:10 -0700 |
| commit | 385a753dead6ef15f2e30eae47f73e642b3ef7ed (patch) | |
| tree | ae4e55f4c7903e62f23802c7d49ad97ae5b2f0a7 /policy | |
| parent | a376d030a2075909219926d622b71016418d7dcd (diff) | |
| parent | 368fdba47a49f249aa4346edaf3f45291ca6a7ff (diff) | |
| download | frameworks_base-385a753dead6ef15f2e30eae47f73e642b3ef7ed.zip frameworks_base-385a753dead6ef15f2e30eae47f73e642b3ef7ed.tar.gz frameworks_base-385a753dead6ef15f2e30eae47f73e642b3ef7ed.tar.bz2 | |
resolved conflicts for merge of 368fdba4 to master
Change-Id: I42b7b433c86a71a5da5db67109f056a280077c9d
Diffstat (limited to 'policy')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java b/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java index d19f318..165107c 100644 --- a/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java +++ b/policy/src/com/android/internal/policy/impl/KeyguardViewMediator.java @@ -97,8 +97,8 @@ import android.view.WindowManagerPolicy; public class KeyguardViewMediator implements KeyguardViewCallback, KeyguardUpdateMonitor.SimStateCallback { private static final int KEYGUARD_DISPLAY_TIMEOUT_DELAY_DEFAULT = 30000; - private final static boolean DEBUG = false && Config.LOGD; - private final static boolean DBG_WAKE = DEBUG || true; + private final static boolean DEBUG = false; + private final static boolean DBG_WAKE = false; private final static String TAG = "KeyguardViewMediator"; @@ -642,7 +642,7 @@ public class KeyguardViewMediator implements KeyguardViewCallback, * @see #onWakeKeyWhenKeyguardShowingTq(int) */ private void wakeWhenReadyLocked(int keyCode) { - if (DBG_WAKE) Log.d(TAG, "wakeWhenReadyLocked(" + keyCode + ")"); + if (true || DBG_WAKE) Log.d(TAG, "wakeWhenReadyLocked(" + keyCode + ")"); /** * acquire the handoff lock that will keep the cpu running. this will @@ -1169,5 +1169,3 @@ public class KeyguardViewMediator implements KeyguardViewCallback, } } } - - |