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

Commit 0024076b authored by Shuo Qian's avatar Shuo Qian Committed by Gerrit Code Review
Browse files

Merge "Make getPackagesWithPriviligesForAllActiveSubscriptions system API"

parents a11df59b 22f5749c

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -8695,6 +8695,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" />

services/usage/java/com/android/server/usage/AppStandbyController.java

+2 −1
Original line number Diff line number Diff line
@@ -1356,7 +1356,8 @@ public class AppStandbyController { 
    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);

telephony/java/android/telephony/TelephonyManager.java

+12 −4
Original line number Diff line number Diff line
@@ -8008,17 +8008,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;

    }