Merge "Hide APIs introduced in earlier change" into rvc-dev (19ecc1c9) · Commits · e / os / android_frameworks_base

api/system-current.txt

+0 −5

Original line number	Diff line number	Diff line
		@@ -9426,9 +9426,7 @@ package android.provider {
		public static final class Telephony.Carriers implements android.provider.BaseColumns {
		field public static final String APN_SET_ID = "apn_set_id";
		field public static final int CARRIER_EDITED = 4; // 0x4
		field @NonNull public static final android.net.Uri DPC_URI;
		field public static final String EDITED_STATUS = "edited";
		field public static final int INVALID_APN_ID = -1; // 0xffffffff
		field public static final String MAX_CONNECTIONS = "max_conns";
		field public static final String MODEM_PERSIST = "modem_cognitive";
		field public static final String MTU = "mtu";
		@@ -11539,7 +11537,6 @@ package android.telephony {
		}

		public class TelephonyManager {
		method public int addDevicePolicyOverrideApn(@NonNull android.content.Context, @NonNull android.telephony.data.ApnSetting);
		method @Deprecated @RequiresPermission(android.Manifest.permission.CALL_PHONE) public void call(String, String);
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int changeIccLockPassword(@NonNull String, @NonNull String);
		method public int checkCarrierPrivilegesForPackage(String);
		@@ -11572,7 +11569,6 @@ package android.telephony {
		method @Deprecated public boolean getDataEnabled();
		method @Deprecated public boolean getDataEnabled(int);
		method @Nullable public static android.content.ComponentName getDefaultRespondViaMessageApplication(@NonNull android.content.Context, boolean);
		method @NonNull public java.util.List<android.telephony.data.ApnSetting> getDevicePolicyOverrideApns(@NonNull android.content.Context);
		method @Nullable @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public String getDeviceSoftwareVersion(int);
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean getEmergencyCallbackMode();
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public int getEmergencyNumberDbVersion();
		@@ -11622,7 +11618,6 @@ package android.telephony {
		method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isVideoCallingEnabled();
		method @Deprecated @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public boolean isVisualVoicemailEnabled(android.telecom.PhoneAccountHandle);
		method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public boolean matchesCurrentSimOperator(@NonNull String, int, @Nullable String);
		method public boolean modifyDevicePolicyOverrideApn(@NonNull android.content.Context, int, @NonNull android.telephony.data.ApnSetting);
		method public boolean needsOtaServiceProvisioning();
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void notifyOtaEmergencyNumberDbInstalled();
		method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void notifyUserActivity();

core/java/android/provider/Telephony.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -3551,7 +3551,6 @@ public final class Telephony {
		* can manage DPC-owned APNs.
		* @hide
		*/
		@SystemApi
		public static final @NonNull Uri DPC_URI = Uri.parse("content://telephony/carriers/dpc");

		/**
		@@ -3864,7 +3863,6 @@ public final class Telephony {
		* Integer value denoting an invalid APN id
		* @hide
		*/
		@SystemApi
		public static final int INVALID_APN_ID = -1;

		/**

telephony/java/android/telephony/TelephonyManager.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -12463,7 +12463,6 @@ public class TelephonyManager {
		* @throws {@link SecurityException} if the caller is not the system or phone process.
		* @hide
		*/
		@SystemApi
		@TestApi
		// TODO: add new permission tag indicating that this is system-only.
		public @NonNull List<ApnSetting> getDevicePolicyOverrideApns(@NonNull Context context) {
		@@ -12494,7 +12493,6 @@ public class TelephonyManager {
		* @throws {@link SecurityException} if the caller is not the system or phone process.
		* @hide
		*/
		@SystemApi
		@TestApi
		// TODO: add new permission tag indicating that this is system-only.
		public int addDevicePolicyOverrideApn(@NonNull Context context,
		@@ -12525,7 +12523,6 @@ public class TelephonyManager {
		* @throws {@link SecurityException} if the caller is not the system or phone process.
		* @hide
		*/
		@SystemApi
		@TestApi
		// TODO: add new permission tag indicating that this is system-only.
		public boolean modifyDevicePolicyOverrideApn(@NonNull Context context, int apnId,