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

Commit 345e3ac7 authored by Grace Jia's avatar Grace Jia
Browse files

Fix enforce calling package behavior when called by GmsCore. 

Using PackageManager get from user context to make sure we get correct
uid to check when enforcing the calling package.

Bug: 186380297
Test: Manually set work profile and see the it setup successfully
Change-Id: I4c61e303800bb472c379796f1ea5b50e7f4e71d2
parent 856c4f76

src/java/com/android/internal/telephony/PhoneSubInfoController.java

+9 −6
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.os.Binder; 
import android.os.Build;

import android.os.RemoteException;

import android.os.TelephonyServiceManager.ServiceRegisterer;

import android.os.UserHandle;

import android.telephony.ImsiEncryptionInfo;

import android.telephony.PhoneNumberUtils;

import android.telephony.SubscriptionManager;
@@ -47,7 +48,6 @@ public class PhoneSubInfoController extends IPhoneSubInfo.Stub { 


    @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)

    private final Context mContext;

    private PackageManager mPm;



    public PhoneSubInfoController(Context context) {

        ServiceRegisterer phoneSubServiceRegisterer = TelephonyFrameworkInitializer
@@ -57,7 +57,6 @@ public class PhoneSubInfoController extends IPhoneSubInfo.Stub { 
            phoneSubServiceRegisterer.register(this);

        }

        mContext = context;

        mPm = mContext.getPackageManager();

    }



    @Deprecated
@@ -310,11 +309,15 @@ public class PhoneSubInfoController extends IPhoneSubInfo.Stub { 
     */

    private void enforceCallingPackage(String callingPackage, int callingUid, String message) {

        int packageUid = -1;

        PackageManager pm = mContext.createContextAsUser(

                UserHandle.getUserHandleForUid(callingUid), 0).getPackageManager();

        if (pm != null) {

            try {

            packageUid = mPm.getPackageUid(callingPackage, 0);

                packageUid = pm.getPackageUid(callingPackage, 0);

            } catch (PackageManager.NameNotFoundException e) {

                // packageUid is -1

            }

        }

        if (packageUid != callingUid) {

            throw new SecurityException(message + ": Package " + callingPackage

                    + " does not belong to " + callingUid);