Merge "Keep same behavior after initiatingPackageName change" into udc-dev am: 6e5e43829b

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22212986

Change-Id: I859465aa15851d7028f724d1a014c10c3f54550b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
William Loh
2023-03-23 20:07:45 +00:00
committed by Automerger Merge Worker

View File

@@ -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) {