Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Temporary disable Hotword on lockscreen" into klp-dev

Browse Source
This commit is contained in:
Sandeep Siddhartha
2013-08-27 20:31:32 +00:00
committed by Android (Google) Code Review
parent 373bc29292 c4c330156e
commit 572ec4e88c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/Keyguard/src/com/android/keyguard/KeyguardSelectorView.java
View File

@@ -45,7 +45,7 @@ public class KeyguardSelectorView extends LinearLayout implements KeyguardSecuri
private static final String ASSIST_ICON_METADATA_NAME = private static final String ASSIST_ICON_METADATA_NAME =
"com.android.systemui.action_assist_icon"; "com.android.systemui.action_assist_icon";
// Flag to enable/disable hotword detection on lock screen. // 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 KeyguardSecurityCallback mCallback;
private GlowPadView mGlowPadView; private GlowPadView mGlowPadView;
@@ -332,7 +332,7 @@ public class KeyguardSelectorView extends LinearLayout implements KeyguardSecuri
* it attempts to stop hotwording if it's running. * it attempts to stop hotwording if it's running.
*/ */
private void maybeStartHotwordDetector() { private void maybeStartHotwordDetector() {
if (FLAG_HOTWORD) { if (FLAG_HOTWORD && mHotwordClient != null) {
if (DEBUG) Log.d(TAG, "maybeStartHotwordDetector()"); if (DEBUG) Log.d(TAG, "maybeStartHotwordDetector()");
// Don't start it if the screen is off or not showing // Don't start it if the screen is off or not showing
PowerManager powerManager = (PowerManager) getContext().getSystemService( PowerManager powerManager = (PowerManager) getContext().getSystemService(
@@ -357,7 +357,7 @@ public class KeyguardSelectorView extends LinearLayout implements KeyguardSecuri
* Stop hotword detector if HOTWORDING_ENABLED is true. * Stop hotword detector if HOTWORDING_ENABLED is true.
*/ */
private void maybeStopHotwordDetector() { private void maybeStopHotwordDetector() {
if (FLAG_HOTWORD) { if (FLAG_HOTWORD && mHotwordClient != null) {
if (DEBUG) Log.d(TAG, "maybeStopHotwordDetector()"); if (DEBUG) Log.d(TAG, "maybeStopHotwordDetector()");
mHotwordClient.stop(); mHotwordClient.stop();
} }