PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I98c3e99a3b2b769bfb7bfa6248601702bed3aac7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
William Loh
2023-03-23 19:00:44 +00:00
committed by Automerger Merge Worker
parent 164ef2bc06 6e5e43829b
commit baa16cfefc
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/applications/AppStoreUtil.java
View File

@@ -53,7 +53,8 @@ public class AppStoreUtil {
// so we choose to ignore this when supplied by a non-system app. // so we choose to ignore this when supplied by a non-system app.
String originatingPackageName = source.getOriginatingPackageName(); String originatingPackageName = source.getOriginatingPackageName();
String initiatingPackageName = source.getInitiatingPackageName(); String initiatingPackageName = source.getInitiatingPackageName();
if (originatingPackageName != null && initiatingPackageName != null) { if (originatingPackageName != null && initiatingPackageName != null
&& !initiatingPackageName.equals("com.android.shell")) {
ApplicationInfo ai = context.getPackageManager().getApplicationInfo( ApplicationInfo ai = context.getPackageManager().getApplicationInfo(
initiatingPackageName, 0); initiatingPackageName, 0);
if ((ai.flags & ApplicationInfo.FLAG_SYSTEM) != 0) { if ((ai.flags & ApplicationInfo.FLAG_SYSTEM) != 0) {