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

Commit d635fb20 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

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

Merge "Merge "Use content type specified on the command line" into oc-dev am: f89bf303" into oc-dr1-dev
parents c86a5dbe 5c561290

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

+4 −4
Original line number Original line Diff line number Diff line
@@ -1018,7 +1018,7 @@ class PackageManagerShellCommand extends ShellCommand { 
            throw new RuntimeException(e.getMessage(), e);

            throw new RuntimeException(e.getMessage(), e);

        }

        }

        try {

        try {

            ResolveInfo ri = mInterface.resolveIntent(intent, null, 0, mTargetUser);

            ResolveInfo ri = mInterface.resolveIntent(intent, intent.getType(), 0, mTargetUser);

            PrintWriter pw = getOutPrintWriter();

            PrintWriter pw = getOutPrintWriter();

            if (ri == null) {

            if (ri == null) {

                pw.println("No activity found");

                pw.println("No activity found");
@@ -1040,7 +1040,7 @@ class PackageManagerShellCommand extends ShellCommand { 
            throw new RuntimeException(e.getMessage(), e);

            throw new RuntimeException(e.getMessage(), e);

        }

        }

        try {

        try {

            List<ResolveInfo> result = mInterface.queryIntentActivities(intent, null, 0,

            List<ResolveInfo> result = mInterface.queryIntentActivities(intent, intent.getType(), 0,

                    mTargetUser).getList();

                    mTargetUser).getList();

            PrintWriter pw = getOutPrintWriter();

            PrintWriter pw = getOutPrintWriter();

            if (result == null || result.size() <= 0) {

            if (result == null || result.size() <= 0) {
@@ -1074,7 +1074,7 @@ class PackageManagerShellCommand extends ShellCommand { 
            throw new RuntimeException(e.getMessage(), e);

            throw new RuntimeException(e.getMessage(), e);

        }

        }

        try {

        try {

            List<ResolveInfo> result = mInterface.queryIntentServices(intent, null, 0,

            List<ResolveInfo> result = mInterface.queryIntentServices(intent, intent.getType(), 0,

                    mTargetUser).getList();

                    mTargetUser).getList();

            PrintWriter pw = getOutPrintWriter();

            PrintWriter pw = getOutPrintWriter();

            if (result == null || result.size() <= 0) {

            if (result == null || result.size() <= 0) {
@@ -1108,7 +1108,7 @@ class PackageManagerShellCommand extends ShellCommand { 
            throw new RuntimeException(e.getMessage(), e);

            throw new RuntimeException(e.getMessage(), e);

        }

        }

        try {

        try {

            List<ResolveInfo> result = mInterface.queryIntentReceivers(intent, null, 0,

            List<ResolveInfo> result = mInterface.queryIntentReceivers(intent, intent.getType(), 0,

                    mTargetUser).getList();

                    mTargetUser).getList();

            PrintWriter pw = getOutPrintWriter();

            PrintWriter pw = getOutPrintWriter();

            if (result == null || result.size() <= 0) {

            if (result == null || result.size() <= 0) {