diff options
| author | Sandeep Siddhartha <sansid@google.com> | 2013-08-27 13:38:52 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-27 13:38:52 -0700 |
| commit | 10271233cbe82c31b9cd290216a325e114d807d3 (patch) | |
| tree | 213f18459f830f8926e3074a3e13c7d9305de1ea /packages/Keyguard | |
| parent | d199e5e604cd87616a8e425f01d37e9eefc314ff (diff) | |
| parent | b9265233882d6c026918f985e7448d25d42d5960 (diff) | |
| download | frameworks_base-10271233cbe82c31b9cd290216a325e114d807d3.zip frameworks_base-10271233cbe82c31b9cd290216a325e114d807d3.tar.gz frameworks_base-10271233cbe82c31b9cd290216a325e114d807d3.tar.bz2 | |
am b9265233: am 572ec4e8: Merge "Temporary disable Hotword on lockscreen" into klp-dev
* commit 'b9265233882d6c026918f985e7448d25d42d5960':
Temporary disable Hotword on lockscreen
Diffstat (limited to 'packages/Keyguard')
| -rw-r--r-- | packages/Keyguard/src/com/android/keyguard/KeyguardSelectorView.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardSelectorView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardSelectorView.java index 1c658e3..4fe83fb 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardSelectorView.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardSelectorView.java @@ -45,7 +45,7 @@ public class KeyguardSelectorView extends LinearLayout implements KeyguardSecuri private static final String ASSIST_ICON_METADATA_NAME = "com.android.systemui.action_assist_icon"; // Flag to enable/disable hotword detection on lock screen. - private static final boolean FLAG_HOTWORD = true; + private static final boolean FLAG_HOTWORD = false; private KeyguardSecurityCallback mCallback; private GlowPadView mGlowPadView; @@ -332,7 +332,7 @@ public class KeyguardSelectorView extends LinearLayout implements KeyguardSecuri * it attempts to stop hotwording if it's running. */ private void maybeStartHotwordDetector() { - if (FLAG_HOTWORD) { + if (FLAG_HOTWORD && mHotwordClient != null) { if (DEBUG) Log.d(TAG, "maybeStartHotwordDetector()"); // Don't start it if the screen is off or not showing PowerManager powerManager = (PowerManager) getContext().getSystemService( @@ -357,7 +357,7 @@ public class KeyguardSelectorView extends LinearLayout implements KeyguardSecuri * Stop hotword detector if HOTWORDING_ENABLED is true. */ private void maybeStopHotwordDetector() { - if (FLAG_HOTWORD) { + if (FLAG_HOTWORD && mHotwordClient != null) { if (DEBUG) Log.d(TAG, "maybeStopHotwordDetector()"); mHotwordClient.stop(); } |