diff options
| author | Todd Kennedy <toddke@google.com> | 2017-06-26 15:57:06 -0700 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-06-29 04:37:21 +0000 |
| commit | 192f0bf0c313a8d79abceed3d2892357bca0f116 (patch) | |
| tree | 7c1faa6b01af3791d871ae987c5e69397676989c | |
| parent | af0fec4b65fd25d6b82e8a689a942235aa84b4f0 (diff) | |
| download | base-192f0bf0c313a8d79abceed3d2892357bca0f116.tar.gz | |
Use content type specified on the command line
Bug: 62914247
Test: Manual; query before change and no intents resolved. query after and intent resolved.
Test: sample query command: adb shell cmd package query-activities -a android.intent.action.OPEN_DOCUMENT -c android.intent.category.OPENABLE -t \\*/\\*
Change-Id: Ieadb15bcdebeff01e9b8075932417ba5585de16e
(cherry picked from commit 0e2a75d96d1deab417a7a32fc4007fd7d8057ebf)
| -rw-r--r-- | services/core/java/com/android/server/pm/PackageManagerShellCommand.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java index 184129e03e77..5095e518ed8a 100644 --- a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java +++ b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java @@ -1017,7 +1017,7 @@ class PackageManagerShellCommand extends ShellCommand { throw new RuntimeException(e.getMessage(), e); } try { - ResolveInfo ri = mInterface.resolveIntent(intent, null, 0, mTargetUser); + ResolveInfo ri = mInterface.resolveIntent(intent, intent.getType(), 0, mTargetUser); PrintWriter pw = getOutPrintWriter(); if (ri == null) { pw.println("No activity found"); @@ -1039,7 +1039,7 @@ class PackageManagerShellCommand extends ShellCommand { throw new RuntimeException(e.getMessage(), e); } try { - List<ResolveInfo> result = mInterface.queryIntentActivities(intent, null, 0, + List<ResolveInfo> result = mInterface.queryIntentActivities(intent, intent.getType(), 0, mTargetUser).getList(); PrintWriter pw = getOutPrintWriter(); if (result == null || result.size() <= 0) { @@ -1073,7 +1073,7 @@ class PackageManagerShellCommand extends ShellCommand { throw new RuntimeException(e.getMessage(), e); } try { - List<ResolveInfo> result = mInterface.queryIntentServices(intent, null, 0, + List<ResolveInfo> result = mInterface.queryIntentServices(intent, intent.getType(), 0, mTargetUser).getList(); PrintWriter pw = getOutPrintWriter(); if (result == null || result.size() <= 0) { @@ -1107,7 +1107,7 @@ class PackageManagerShellCommand extends ShellCommand { throw new RuntimeException(e.getMessage(), e); } try { - List<ResolveInfo> result = mInterface.queryIntentReceivers(intent, null, 0, + List<ResolveInfo> result = mInterface.queryIntentReceivers(intent, intent.getType(), 0, mTargetUser).getList(); PrintWriter pw = getOutPrintWriter(); if (result == null || result.size() <= 0) { |