diff --git a/api/system-current.txt b/api/system-current.txt
index a8b440c5dfbd2..6e95c027c60b9 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -2317,7 +2317,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;
diff --git a/api/test-current.txt b/api/test-current.txt
index c645a612c325a..1b8f1be0f3c3b 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -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;
diff --git a/core/java/android/app/ApplicationPackageManager.java b/core/java/android/app/ApplicationPackageManager.java
index 18df401c9c8de..0b0a803c7dcd0 100644
--- a/core/java/android/app/ApplicationPackageManager.java
+++ b/core/java/android/app/ApplicationPackageManager.java
@@ -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 {
diff --git a/core/java/android/content/pm/IPackageManager.aidl b/core/java/android/content/pm/IPackageManager.aidl
index 0311120aebfbb..b52034f637a4f 100644
--- a/core/java/android/content/pm/IPackageManager.aidl
+++ b/core/java/android/content/pm/IPackageManager.aidl
@@ -680,8 +680,6 @@ interface IPackageManager {
String getWellbeingPackageName();
- String[] getTelephonyPackageNames();
-
String getAppPredictionServicePackageName();
String getSystemCaptionsServicePackageName();
diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java
index d78d7084504e4..1461813a3372d 100644
--- a/core/java/android/content/pm/PackageManager.java
+++ b/core/java/android/content/pm/PackageManager.java
@@ -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.
*
diff --git a/core/java/android/content/pm/PermissionInfo.java b/core/java/android/content/pm/PermissionInfo.java
index 3aa1a6d3f8fff..c6c288239d1fc 100644
--- a/core/java/android/content/pm/PermissionInfo.java
+++ b/core/java/android/content/pm/PermissionInfo.java
@@ -237,17 +237,6 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable {
@TestApi
public static final int PROTECTION_FLAG_APP_PREDICTOR = 0x200000;
- /**
- * Additional flag for {@link #protectionLevel}, corresponding
- * to the telephony value of
- * {@link android.R.attr#protectionLevel}.
- *
- * @hide
- */
- @SystemApi
- @TestApi
- public static final int PROTECTION_FLAG_TELEPHONY = 0x400000;
-
/**
* Additional flag for {@link #protectionLevel}, corresponding
* to the companion value of
@@ -291,7 +280,6 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable {
PROTECTION_FLAG_CONFIGURATOR,
PROTECTION_FLAG_INCIDENT_REPORT_APPROVER,
PROTECTION_FLAG_APP_PREDICTOR,
- PROTECTION_FLAG_TELEPHONY,
PROTECTION_FLAG_COMPANION,
PROTECTION_FLAG_RETAIL_DEMO,
})
@@ -537,9 +525,6 @@ public class PermissionInfo extends PackageItemInfo implements Parcelable {
if ((level & PermissionInfo.PROTECTION_FLAG_APP_PREDICTOR) != 0) {
protLevel += "|appPredictor";
}
- if ((level & PermissionInfo.PROTECTION_FLAG_TELEPHONY) != 0) {
- protLevel += "|telephony";
- }
if ((level & PermissionInfo.PROTECTION_FLAG_RETAIL_DEMO) != 0) {
protLevel += "|retailDemo";
}
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 5446a661a599a..bb33eca4c81bf 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -737,7 +737,7 @@
+ android:protectionLevel="signature" />
+ android:protectionLevel="signature" />
+ android:protectionLevel="signature" />
+ android:protectionLevel="signature" />
+ android:protectionLevel="signature" />
+ android:protectionLevel="signature" />
+ android:protectionLevel="signature" />
@@ -2676,7 +2676,7 @@
@hide
-->
+ android:protectionLevel="signature" />
+ android:protectionLevel="signature" />
+ android:protectionLevel="signature" />
+ android:protectionLevel="signature" />
+ android:protectionLevel="signature" />
+ android:protectionLevel="signature" />
+ android:protectionLevel="signature" />
-
-
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 4993aafe337f7..94764caf300f2 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -3641,15 +3641,6 @@
-->
-
- "com.android.phone,com.android.stk,com.android.providers.telephony,com.android.ons"
-