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

Commit 8c370fa7 authored by Shuo Qian's avatar Shuo Qian Committed by Android (Google) Code Review
Browse files

Merge "Make getPackagesWithPriviligesForAllActiveSubscriptions system API"

parents 1aba5d25 6f27c576

apex/jobscheduler/service/java/com/android/server/usage/AppStandbyController.java

+2 −1
Original line number Diff line number Diff line
@@ -1171,7 +1171,8 @@ public class AppStandbyController implements AppStandbyInternal { 
    private void fetchCarrierPrivilegedAppsLocked() {

        TelephonyManager telephonyManager =

                mContext.getSystemService(TelephonyManager.class);

        mCarrierPrivilegedApps = telephonyManager.getPackagesWithCarrierPrivilegesForAllPhones();

        mCarrierPrivilegedApps =

                telephonyManager.getCarrierPrivilegedPackagesForAllActiveSubscriptions();

        mHaveCarrierPrivilegedApps = true;

        if (DEBUG) {

            Slog.d(TAG, "apps with carrier privilege " + mCarrierPrivilegedApps);

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -9427,6 +9427,7 @@ package android.telephony { 
    method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public android.telephony.ImsiEncryptionInfo getCarrierInfoForImsiEncryption(int);

    method public java.util.List<java.lang.String> getCarrierPackageNamesForIntent(android.content.Intent);

    method public java.util.List<java.lang.String> getCarrierPackageNamesForIntentAndPhone(android.content.Intent, int);

    method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public java.util.List<java.lang.String> getCarrierPrivilegedPackagesForAllActiveSubscriptions();

    method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public android.telephony.CarrierRestrictionRules getCarrierRestrictionRules();

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public String getCdmaMdn();

    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public String getCdmaMdn(int);

services/tests/servicestests/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />

    <uses-permission android:name="android.permission.MANAGE_DEVICE_ADMINS" />

    <uses-permission android:name="android.permission.MODIFY_PHONE_STATE" />

    <uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE" />

    <uses-permission android:name="android.permission.INTERNET" />

    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />

    <uses-permission android:name="android.permission.PACKET_KEEPALIVE_OFFLOAD" />

telephony/java/android/telephony/TelephonyManager.java

+12 −4
Original line number Diff line number Diff line
@@ -8161,17 +8161,25 @@ public class TelephonyManager { 
        return Collections.EMPTY_LIST;

    }



    /** @hide */

    public List<String> getPackagesWithCarrierPrivilegesForAllPhones() {

    /**

     * Get the names of packages with carrier privileges for all the active subscriptions.

     *

     * @hide

     */

    @SystemApi

    @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)

    @NonNull

    public List<String> getCarrierPrivilegedPackagesForAllActiveSubscriptions() {

        try {

            ITelephony telephony = getITelephony();

            if (telephony != null) {

                return telephony.getPackagesWithCarrierPrivilegesForAllPhones();

            }

        } catch (RemoteException ex) {

            Rlog.e(TAG, "getPackagesWithCarrierPrivilegesForAllPhones RemoteException", ex);

            Rlog.e(TAG, "getCarrierPrivilegedPackagesForAllActiveSubscriptions RemoteException",

                    ex);

        } catch (NullPointerException ex) {

            Rlog.e(TAG, "getPackagesWithCarrierPrivilegesForAllPhones NPE", ex);

            Rlog.e(TAG, "getCarrierPrivilegedPackagesForAllActiveSubscriptions NPE", ex);

        }

        return Collections.EMPTY_LIST;

    }