diff options
author | Danny Baumann <dannybaumann@web.de> | 2013-09-01 11:35:29 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-09-01 11:35:29 +0000 |
commit | 39e05c74197bf54ba89f025ae98bfa16387234f6 (patch) | |
tree | 5fa083d70a8cc0df975acbcbb966cd872973a4bf | |
parent | 2e54d5d3251823be796aa7dc62b12ff1ce88f75d (diff) | |
parent | 3f64f6260db491e23a6cdc7a330f5b1dbc9a7b49 (diff) | |
download | frameworks_base-39e05c74197bf54ba89f025ae98bfa16387234f6.zip frameworks_base-39e05c74197bf54ba89f025ae98bfa16387234f6.tar.gz frameworks_base-39e05c74197bf54ba89f025ae98bfa16387234f6.tar.bz2 |
Merge "PowerWidget: Dismiss unsecure keyguard on long tap" into cm-10.1
-rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/powerwidget/PowerButton.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/powerwidget/PowerButton.java b/packages/SystemUI/src/com/android/systemui/statusbar/powerwidget/PowerButton.java index 2ff3161..7452a31 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/powerwidget/PowerButton.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/powerwidget/PowerButton.java @@ -1,6 +1,5 @@ package com.android.systemui.statusbar.powerwidget; -import android.app.ActivityManagerNative; import android.content.ContentResolver; import android.content.Context; import android.content.Intent; @@ -14,6 +13,7 @@ import android.os.RemoteException; import android.os.Vibrator; import android.text.TextUtils; import android.view.View; +import android.view.WindowManagerGlobal; import android.widget.ImageView; import com.android.systemui.R; @@ -168,9 +168,11 @@ public abstract class PowerButton { mVibrator.vibrate(mLongClickPattern, -1); } - try { - ActivityManagerNative.getDefault().dismissKeyguardOnNextActivity(); - } catch (RemoteException e) { + if (result) { + try { + WindowManagerGlobal.getWindowManagerService().dismissKeyguard(); + } catch (RemoteException e) { + } } if (result && mExternalLongClickListener != null) { |