1 files changed, 9 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/quicksettings/ToggleLockscreenTile.java b/packages/SystemUI/src/com/android/systemui/quicksettings/ToggleLockscreenTile.java
index d452d00..1de2c47 100644
--- a/packages/SystemUI/src/com/android/systemui/quicksettings/ToggleLockscreenTile.java
+++ b/packages/SystemUI/src/com/android/systemui/quicksettings/ToggleLockscreenTile.java
@@ -60,6 +60,14 @@ public class ToggleLockscreenTile extends QuickSettingsTile {
     }
 
     @Override
+    public void onDestroy() {
+        if (mLock != null) {
+            mLock.reenableKeyguard();
+        }
+        super.onDestroy();
+    }
+
+    @Override
     public void updateResources() {
         updateTile();
         super.updateResources();
@@ -70,7 +78,7 @@ public class ToggleLockscreenTile extends QuickSettingsTile {
         if (mLock == null) {
             KeyguardManager keyguardManager = (KeyguardManager)
                     mContext.getSystemService(Context.KEYGUARD_SERVICE);
-            mLock = keyguardManager.newKeyguardLock("PowerWidget");
+            mLock = keyguardManager.newKeyguardLock("LockscreenTile");
         }
         if (mDisabledLockscreen) {
             mDrawable = R.drawable.ic_qs_lock_screen_off;