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

Commit 999b42d6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix the command problem "adb shell pm list permissions -f"" into... 

Merge "Fix the command problem "adb shell pm list permissions -f"" into udc-qpr-dev am: 43a52ec8 am: c9fa83fc

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24825387



Change-Id: I21002078173f86f6f378782058bafbdde6d648e2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4ad4f6a0 c9fa83fc

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

+4 −0
Original line number Original line Diff line number Diff line
@@ -4568,6 +4568,10 @@ class PackageManagerShellCommand extends ShellCommand { 
                PackageManager.MATCH_DISABLED_COMPONENTS

                PackageManager.MATCH_DISABLED_COMPONENTS

                        | PackageManager.MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS

                        | PackageManager.MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS

                        | PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS, 0);

                        | PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS, 0);

        if (ai == null) {

            Slog.e(TAG, "Failed to get ApplicationInfo for package name(" + pii.packageName + ").");

            return null;

        }

        AssetManager am = new AssetManager();

        AssetManager am = new AssetManager();

        am.addAssetPath(ai.publicSourceDir);

        am.addAssetPath(ai.publicSourceDir);

        res = new Resources(am, null, null);

        res = new Resources(am, null, null);