From 5d2420d4937c88c92b3b41f9052d9089af405ba0 Mon Sep 17 00:00:00 2001 From: William Loh Date: Tue, 21 Feb 2023 21:57:52 +0000 Subject: [PATCH] Keep same behavior after initiatingPackageName change InitiatingPackageName was previously set to null for all shell based installs but has now been changed to "com.android.shell". Bug: 265203007 Test: atest AppStoreUtilTest (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:acab1045f3786f775d0c51ffb50f5ff654fc53d8) Merged-In: I3b8639c5530782375d0b26c9a65c1662eced5493 Change-Id: I3b8639c5530782375d0b26c9a65c1662eced5493 --- src/com/android/settings/applications/AppStoreUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/applications/AppStoreUtil.java b/src/com/android/settings/applications/AppStoreUtil.java index b18a68fd7db..b73b14ae709 100644 --- a/src/com/android/settings/applications/AppStoreUtil.java +++ b/src/com/android/settings/applications/AppStoreUtil.java @@ -53,7 +53,8 @@ public class AppStoreUtil { // so we choose to ignore this when supplied by a non-system app. String originatingPackageName = source.getOriginatingPackageName(); String initiatingPackageName = source.getInitiatingPackageName(); - if (originatingPackageName != null && initiatingPackageName != null) { + if (originatingPackageName != null && initiatingPackageName != null + && !initiatingPackageName.equals("com.android.shell")) { ApplicationInfo ai = context.getPackageManager().getApplicationInfo( initiatingPackageName, 0); if ((ai.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {