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

Commit 05b37870 authored by Jack Yu's avatar Jack Yu
Browse files

Removed the flag hsum_package_manager 

Removed the 25Q2 flag hsum_package_manager

Test: atest FrameworksTelephonyTests
Fix: 409610430
Flag: EXEMPT flag removal
Change-Id: I3746cf35ce26a0d925a22ee617132c99969a9619
parent 33c3a30b

telephony/common/android/telephony/LocationAccessPolicy.java

+3 −11
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ import android.util.Log; 
import android.widget.Toast;



import com.android.internal.telephony.TelephonyPermissions;

import com.android.internal.telephony.flags.Flags;

import com.android.internal.telephony.util.TelephonyUtils;



/**
@@ -427,17 +426,10 @@ public final class LocationAccessPolicy { 
    private static boolean isAppAtLeastSdkVersion(Context context,

            @NonNull UserHandle callingUserHandle, String pkgName, int sdkVersion) {

        try {

            if (Flags.hsumPackageManager()) {

            if (context.getPackageManager().getApplicationInfoAsUser(

                    pkgName, 0, callingUserHandle).targetSdkVersion >= sdkVersion) {

                return true;

            }

            } else {

                if (context.getPackageManager().getApplicationInfo(pkgName, 0).targetSdkVersion

                        >= sdkVersion) {

                    return true;

                }

            }

        } catch (PackageManager.NameNotFoundException e) {

            // In case of exception, assume known app (more strict checking)

            // Note: This case will never happen since checkPackage is

telephony/java/android/telephony/SubscriptionManager.java

+1 −23
Original line number Diff line number Diff line
@@ -3526,29 +3526,7 @@ public class SubscriptionManager { 
    @SystemApi

    public boolean canManageSubscription(@NonNull SubscriptionInfo info,

            @NonNull String packageName) {

        if (Flags.hsumPackageManager()) {

        return canManageSubscriptionAsUser(info, packageName, mContext.getUser());

        } else {

            if (info == null || info.getAccessRules() == null || packageName == null) {

                return false;

            }

            PackageManager packageManager = mContext.getPackageManager();

            PackageInfo packageInfo;

            try {

                packageInfo = packageManager.getPackageInfo(packageName,

                        PackageManager.GET_SIGNING_CERTIFICATES);

            } catch (PackageManager.NameNotFoundException e) {

                logd("Unknown package: " + packageName);

                return false;

            }

            for (UiccAccessRule rule : info.getAccessRules()) {

                if (rule.getCarrierPrivilegeStatus(packageInfo)

                        == TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS) {

                    return true;

                }

            }

            return false;

        }

    }



    /**