summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/src/com/android/systemui/keyguard
diff options
context:
space:
mode:
authorRoman Birg <roman@cyngn.com>2015-01-02 16:07:39 -0800
committerSteve Kondik <steve@cyngn.com>2015-10-26 02:34:27 -0700
commit62b6f79e306473174ecf7e93c812a62d1e2e7c16 (patch)
tree28b18662f0e6f99315006b53e7d82bdc6f8e0f0c /packages/SystemUI/src/com/android/systemui/keyguard
parentd4da0af73fcb119f6ed671af18a452628c376ffd (diff)
downloadframeworks_base-62b6f79e306473174ecf7e93c812a62d1e2e7c16.zip
frameworks_base-62b6f79e306473174ecf7e93c812a62d1e2e7c16.tar.gz
frameworks_base-62b6f79e306473174ecf7e93c812a62d1e2e7c16.tar.bz2
Keyguard: allow keyguard to be dismissed via intent
Change-Id: I16dcba63d849da8c6026ecaad8de778868cfd8ee Signed-off-by: Roman Birg <roman@cyngn.com>
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/keyguard')
-rwxr-xr-xpackages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java9
1 files changed, 9 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
index 008c833..4a4bbf2 100755
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
@@ -135,6 +135,9 @@ public class KeyguardViewMediator extends SystemUI {
private static final String DELAYED_KEYGUARD_ACTION =
"com.android.internal.policy.impl.PhoneWindowManager.DELAYED_KEYGUARD";
+ private static final String DISMISS_KEYGUARD_SECURELY_ACTION =
+ "com.android.keyguard.action.DISMISS_KEYGUARD_SECURELY";
+
// used for handler messages
private static final int SHOW = 2;
private static final int HIDE = 3;
@@ -576,6 +579,8 @@ public class KeyguardViewMediator extends SystemUI {
mShowKeyguardWakeLock.setReferenceCounted(false);
mProfileManager = ProfileManager.getInstance(mContext);
mContext.registerReceiver(mBroadcastReceiver, new IntentFilter(DELAYED_KEYGUARD_ACTION));
+ mContext.registerReceiver(mBroadcastReceiver, new IntentFilter(DISMISS_KEYGUARD_SECURELY_ACTION),
+ android.Manifest.permission.CONTROL_KEYGUARD, null);
mKeyguardDisplayManager = new KeyguardDisplayManager(mContext);
@@ -1207,6 +1212,10 @@ public class KeyguardViewMediator extends SystemUI {
doKeyguardLocked(null);
}
}
+ } else if (DISMISS_KEYGUARD_SECURELY_ACTION.equals(intent.getAction())) {
+ synchronized (KeyguardViewMediator.this) {
+ dismiss();
+ }
}
}
};