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

Commit 0ed16d7b authored by Amit Mahajan's avatar Amit Mahajan Committed by Android (Google) Code Review
Browse files

Merge changes from topic "Remove telephony protection level" into rvc-dev 

* changes:
  Remove telephony protection level.
  Revert "Allowed telephony to bind network service"
  Revert "add telephony role to some permissions needed by telephony module"
parents d138fb0f 7931b2ef

api/system-current.txt

+0 −1
Original line number Diff line number Diff line
@@ -2313,7 +2313,6 @@ package android.content.pm { 
    field public static final int PROTECTION_FLAG_OEM = 16384; // 0x4000

    field public static final int PROTECTION_FLAG_RETAIL_DEMO = 16777216; // 0x1000000

    field public static final int PROTECTION_FLAG_SYSTEM_TEXT_CLASSIFIER = 65536; // 0x10000

    field public static final int PROTECTION_FLAG_TELEPHONY = 4194304; // 0x400000

    field public static final int PROTECTION_FLAG_WELLBEING = 131072; // 0x20000

    field @Nullable public final String backgroundPermission;

    field @StringRes public int requestRes;

api/test-current.txt

+0 −2
Original line number Diff line number Diff line
@@ -964,7 +964,6 @@ package android.content.pm { 
    method @NonNull public abstract String getServicesSystemSharedLibraryPackageName();

    method @NonNull public abstract String getSharedSystemSharedLibraryPackageName();

    method @Nullable public String getSystemTextClassifierPackageName();

    method @Nullable public String[] getTelephonyPackageNames();

    method @Nullable public String getWellbeingPackageName();

    method @RequiresPermission("android.permission.GRANT_RUNTIME_PERMISSIONS") public abstract void grantRuntimePermission(@NonNull String, @NonNull String, @NonNull android.os.UserHandle);

    method @RequiresPermission("android.permission.OBSERVE_GRANT_REVOKE_PERMISSIONS") public abstract void removeOnPermissionsChangeListener(@NonNull android.content.pm.PackageManager.OnPermissionsChangedListener);
@@ -1007,7 +1006,6 @@ package android.content.pm { 
    field public static final int PROTECTION_FLAG_OEM = 16384; // 0x4000

    field public static final int PROTECTION_FLAG_RETAIL_DEMO = 16777216; // 0x1000000

    field public static final int PROTECTION_FLAG_SYSTEM_TEXT_CLASSIFIER = 65536; // 0x10000

    field public static final int PROTECTION_FLAG_TELEPHONY = 4194304; // 0x400000

    field public static final int PROTECTION_FLAG_VENDOR_PRIVILEGED = 32768; // 0x8000

    field public static final int PROTECTION_FLAG_WELLBEING = 131072; // 0x20000

    field @Nullable public final String backgroundPermission;

core/java/android/app/ApplicationPackageManager.java

+0 −9
Original line number Diff line number Diff line
@@ -3296,15 +3296,6 @@ public class ApplicationPackageManager extends PackageManager { 
        }

    }



    @Override

    public String[] getTelephonyPackageNames() {

        try {

            return mPM.getTelephonyPackageNames();

        } catch (RemoteException e) {

            throw e.rethrowAsRuntimeException();

        }

    }



    @Override

    public String getSystemCaptionsServicePackageName() {

        try {

core/java/android/content/pm/IPackageManager.aidl

+0 −2
Original line number Diff line number Diff line
@@ -680,8 +680,6 @@ interface IPackageManager { 


    String getWellbeingPackageName();



    String[] getTelephonyPackageNames();



    String getAppPredictionServicePackageName();



    String getSystemCaptionsServicePackageName();

core/java/android/content/pm/PackageManager.java

+0 −12
Original line number Diff line number Diff line
@@ -7795,18 +7795,6 @@ public abstract class PackageManager { 
            "getAppPredictionServicePackageName not implemented in subclass");

    }



    /**

     * @return the system defined telephony package names, or null if there's none.

     *

     * @hide

     */

    @Nullable

    @TestApi

    public String[] getTelephonyPackageNames() {

        throw new UnsupportedOperationException(

                "getTelephonyPackageNames not implemented in subclass");

    }



    /**

     * @return the system defined content capture service package name, or null if there's none.

     *