Merge "Use content type specified on the command line" into oc-dev (f89bf303) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/pm/PackageManagerShellCommand.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -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) {