diff options
| author | David van Tonder <david.vantonder@gmail.com> | 2013-04-18 03:42:44 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-04-18 03:42:44 -0700 |
| commit | ee3f864d5be6e5d2c567d227b3d3308459e6083b (patch) | |
| tree | 21225b706a9b755ef992cdd2e91589434a324c0d /packages/SystemUI/src/com/android/systemui/statusbar | |
| parent | d29998aa881b3eda0be6465b3634d76d064c835d (diff) | |
| parent | 358654f3e2fc34a5b3eeb786202c48c655cea844 (diff) | |
| download | frameworks_base-ee3f864d5be6e5d2c567d227b3d3308459e6083b.zip frameworks_base-ee3f864d5be6e5d2c567d227b3d3308459e6083b.tar.gz frameworks_base-ee3f864d5be6e5d2c567d227b3d3308459e6083b.tar.bz2 | |
Merge "Don't start keyguard in an attempt to exit it." into cm-10.1
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/statusbar')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java index 8865842..0978243 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java @@ -995,10 +995,6 @@ public abstract class BaseStatusBar extends SystemUI implements // the stack trace isn't very helpful here. Just log the exception message. Slog.w(TAG, "Sending contentIntent failed: " + e); } - - KeyguardManager kgm = - (KeyguardManager) mContext.getSystemService(Context.KEYGUARD_SERVICE); - if (kgm != null) kgm.exitKeyguardSecurely(null); } try { |