summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2015-07-17 22:03:44 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-07-17 22:03:46 +0000
commit5c269121d8ea0bf3f530f2314695e189ffdb3165 (patch)
tree03db35ff73bdd0b1d9293818bafcabb2b8f24784 /services
parent5ff4383b466fc26e6696a7bbeb6df5eb7a3c8cc5 (diff)
parentf38c4ee9030b68c2f2b00d376c7d4a05a58a818a (diff)
downloadframeworks_base-5c269121d8ea0bf3f530f2314695e189ffdb3165.zip
frameworks_base-5c269121d8ea0bf3f530f2314695e189ffdb3165.tar.gz
frameworks_base-5c269121d8ea0bf3f530f2314695e189ffdb3165.tar.bz2
Merge "Work on issue #22556778: Starting under voice control not allowed" into mnc-dev
Diffstat (limited to 'services')
-rw-r--r--services/core/java/com/android/server/pm/PackageManagerService.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index d3f7795..293043a 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -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;