Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c561290 authored by Todd Kennedy's avatar Todd Kennedy Committed by android-build-merger
Browse files

Merge "Use content type specified on the command line" into oc-dev 

am: f89bf303

Change-Id: I2eafecfbf73333541a8b28726dc2af0a456443c0
parents 9c1cdf2f f89bf303

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

+4 −4
Original line number Diff line number Diff line
@@ -1018,7 +1018,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");
@@ -1040,7 +1040,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) {
@@ -1074,7 +1074,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) {
@@ -1108,7 +1108,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) {