Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Optimize ActiveServices targetSdkVersion fetch" into tm-dev am: 81fdbfc0e3 am: 4da827d4bf

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

Change-Id: I34483fcd11b9d3988a13e675598c50978522dca9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Winson Chiu
2022-05-12 17:58:39 +00:00
committed by Automerger Merge Worker
parent 8b61491faa 4da827d4bf
commit edbfa57152
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/am/ActiveServices.java
View File

@@ -6593,12 +6593,11 @@ public final class ActiveServices {
}
final int uidState = mAm.getUidStateLocked(callingUid);
int callerTargetSdkVersion = INVALID_UID;
int callerTargetSdkVersion = -1;
try {
ApplicationInfo ai = mAm.mContext.getPackageManager().getApplicationInfoAsUser(
callingPackage, PackageManager.MATCH_KNOWN_PACKAGES, userId);
callerTargetSdkVersion = ai.targetSdkVersion;
} catch (PackageManager.NameNotFoundException e) {
callerTargetSdkVersion = mAm.mContext.getPackageManager()
.getTargetSdkVersion(callingPackage);
} catch (PackageManager.NameNotFoundException ignored) {
}
final String debugInfo =
"[callingPackage: " + callingPackage