diff options
| author | 2023-09-22 17:16:43 +0000 | |
|---|---|---|
| committer | 2023-09-22 17:16:43 +0000 | |
| commit | c9fa83fcada2cbfe942d2279e1e844ce228ccc85 (patch) | |
| tree | 4230b6f4d12b1e6e289e1b4570d15877e0cca13c | |
| parent | 784fd136677db3b7c26fade409b2566fd5f5fa10 (diff) | |
| parent | 43a52ec878ca45ae6297a8c80ea3a84b2c573bc6 (diff) | |
Merge "Fix the command problem "adb shell pm list permissions -f"" into udc-qpr-dev am: 43a52ec878
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24825387
Change-Id: I74892bab26a414496bec9e8806546d4e8daef1bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/java/com/android/server/pm/PackageManagerShellCommand.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java index 2a7ebfb75dde..5d0fffd01e1a 100644 --- a/services/core/java/com/android/server/pm/PackageManagerShellCommand.java +++ b/services/core/java/com/android/server/pm/PackageManagerShellCommand.java @@ -4142,6 +4142,10 @@ class PackageManagerShellCommand extends ShellCommand { PackageManager.MATCH_DISABLED_COMPONENTS | PackageManager.MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS | 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(); am.addAssetPath(ai.publicSourceDir); res = new Resources(am, null, null); |