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

Commit c70f1a8a authored by Paul Hu's avatar Paul Hu Committed by Automerger Merge Worker
Browse files

Merge "Replace PackageManager @hide APIs" am: 18cf9c19 am: 8804e022 am: 5503eaee 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I553db1721ab56fce663bc6db10aa23735f5788d8
parents 2115e3c3 5503eaee

services/core/java/com/android/server/ConnectivityService.java

+5 −4
Original line number Diff line number Diff line
@@ -5579,11 +5579,12 @@ public class ConnectivityService extends IConnectivityManager.Stub 
    }



    private boolean checkUnsupportedStartingFrom(int version, String callingPackageName) {

        final PackageManager pm = mContext.getPackageManager();

        final int userId = UserHandle.getCallingUserId();

        final UserHandle user = UserHandle.getUserHandleForUid(Binder.getCallingUid());

        final PackageManager pm =

                mContext.createContextAsUser(user, 0 /* flags */).getPackageManager();

        try {

            final int callingVersion = pm.getApplicationInfoAsUser(

                    callingPackageName, 0 /* flags */, userId).targetSdkVersion;

            final int callingVersion = pm.getApplicationInfo(

                    callingPackageName, 0 /* flags */).targetSdkVersion;

            if (callingVersion < version) return false;

        } catch (PackageManager.NameNotFoundException e) { }

        return true;