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

Merge "Work on issue #22556778: Starting under voice control not allowed" into mnc-dev

Browse Source
This commit is contained in:
Dianne Hackborn
2015-07-17 22:03:44 +00:00
committed by Android (Google) Code Review
parent 5ff4383b46 f38c4ee903
commit 5c269121d8
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/com/android/internal/app/ResolverActivity.java
View File

@@ -19,14 +19,11 @@ package com.android.internal.app;
import android.annotation.Nullable;
import android.app.Activity;
import android.app.ActivityThread;
import android.app.VoiceInteractor;
import android.app.VoiceInteractor.PickOptionRequest;
import android.app.VoiceInteractor.PickOptionRequest.Option;
import android.app.VoiceInteractor.Prompt;
import android.app.VoiceInteractor.Request;
import android.os.AsyncTask;
import android.provider.Settings;
import android.service.chooser.ChooserTarget;
import android.text.TextUtils;
import android.util.Slog;
import android.widget.AbsListView;

4
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -2967,6 +2967,10 @@ public class PackageManagerService extends IPackageManager.Stub {
public boolean activitySupportsIntent(ComponentName component, Intent intent,
String resolvedType) {
synchronized (mPackages) {
if (component.equals(mResolveComponentName)) {
// The resolver supports EVERYTHING!
return true;
}
PackageParser.Activity a = mActivities.mActivities.get(component);
if (a == null) {
return false;