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

am 22ae5d6d: Merge "Use the permission for hotword recognition" into klp-dev

Browse Source 
* commit '22ae5d6de11b0a6126987293b44cd85048a45015':
  Use the permission for hotword recognition
This commit is contained in:
Sandeep Siddhartha
2013-09-06 15:06:49 -07:00
committed by Android Git Automerger
parent c3360d2a8b 22ae5d6de1
commit 994bf3a111
2 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Keyguard/AndroidManifest.xml
View File

@@ -37,6 +37,8 @@
<uses-permission android:name="android.permission.INTERNAL_SYSTEM_WINDOW" />
<uses-permission android:name="android.permission.BIND_DEVICE_ADMIN" />
<uses-permission android:name="android.permission.CHANGE_COMPONENT_ENABLED_STATE" />
<!-- Permission to perform hotword recognition -->
<uses-permission android:name="android.permission.HOTWORD_RECOGNITION" />
<application android:label="@string/app_name"
android:process="com.android.systemui"

19
packages/Keyguard/src/com/android/keyguard/KeyguardHostView.java
View File

@@ -1784,30 +1784,23 @@ public class KeyguardHostView extends KeyguardViewBase {
}
}
public void onHotwordRecognized(final PendingIntent intent) {
public void onHotwordRecognized(final Intent intent) {
if (DEBUG) Log.d(TAG, "onHotwordRecognized");
maybeStopHotwordDetector();
// See if an activity can handle this intent.
if (getContext().getPackageManager().resolveActivity(intent, 0) == null)
return;
if (SecurityMode.None == mCurrentSecuritySelection) {
if (intent != null) {
try {
intent.send();
} catch (PendingIntent.CanceledException e) {
Log.w(TAG, "Failed to launch PendingIntent. Encountered CanceledException");
}
mActivityLauncher.launchActivity(intent, true, true, null, null);
}
mCallback.userActivity(0);
mCallback.dismiss(false);
} else if (ENABLE_HOTWORD_SECURE && mLockPatternUtils.isSecure()) {
setOnDismissAction(new OnDismissAction() {
@Override
public boolean onDismiss() {
if (intent != null) {
try {
intent.send();
} catch (PendingIntent.CanceledException e) {
Log.w(TAG, "Failed to launch PendingIntent."
+ "Encountered CanceledException");
}
mActivityLauncher.launchActivity(intent, true, true, null, null);
}
return false;
}