Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 46c8af79 authored by Winson Chiu's avatar Winson Chiu Committed by Automerger Merge Worker
Browse files

Merge "Optimize ActiveServices targetSdkVersion fetch" into tm-dev am:... 

Merge "Optimize ActiveServices targetSdkVersion fetch" into tm-dev am: 81fdbfc0 am: c3c7d938 am: 5240768d am: c5e9090e

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



Change-Id: I514517984003ec64506edc071a113a7c7edca8a9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a4d04d07 c5e9090e

services/core/java/com/android/server/am/ActiveServices.java

+4 −5
Original line number Diff line number Diff line
@@ -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