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

Merge "Do not launch assistant via long press when device is locked." into cw-f-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-09-29 18:20:36 +00:00
committed by Android (Google) Code Review
parent 170e5f5e48 0d85ee2e78
commit 2ab563ec6a
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/policy/PhoneWindowManager.java
View File

@@ -1373,8 +1373,13 @@ public class PhoneWindowManager implements WindowManagerPolicy {
case LONG_PRESS_BACK_NOTHING: case LONG_PRESS_BACK_NOTHING:
break; break;
case LONG_PRESS_BACK_GO_TO_VOICE_ASSIST: case LONG_PRESS_BACK_GO_TO_VOICE_ASSIST:
Intent intent = new Intent(Intent.ACTION_VOICE_ASSIST); final boolean keyguardActive = mKeyguardDelegate == null
startActivityAsUser(intent, UserHandle.CURRENT_OR_SELF); ? false
: mKeyguardDelegate.isShowing();
if (!keyguardActive) {
Intent intent = new Intent(Intent.ACTION_VOICE_ASSIST);
startActivityAsUser(intent, UserHandle.CURRENT_OR_SELF);
}
break; break;
} }
} }