From: Ben Komalo Date: Wed, 21 Sep 2011 17:40:50 +0000 (-0700) Subject: Properly initialize wakelock for cryptkeeper. X-Git-Tag: android-x86-4.4-r1~1984^2~10 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9ee164f44ea1ad66fa16ed702eb885e36ade0d8b;p=android-x86%2Fpackages-apps-Settings.git Properly initialize wakelock for cryptkeeper. Bug: 3385856 Change-Id: I6dc39b02b81e290af0b47f6a6c9ba2da3e7c65c3 --- diff --git a/src/com/android/settings/CryptKeeper.java b/src/com/android/settings/CryptKeeper.java index ad2655ff4b..4a7b4fd7e1 100644 --- a/src/com/android/settings/CryptKeeper.java +++ b/src/com/android/settings/CryptKeeper.java @@ -318,7 +318,7 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList // is encrypted. Log.d(TAG, "Encryption progress screen initializing."); - if (mWakeLock != null) { + if (mWakeLock == null) { Log.d(TAG, "Acquiring wakelock."); PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE); mWakeLock = pm.newWakeLock(PowerManager.FULL_WAKE_LOCK, TAG);