Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Hide APIs introduced in earlier change" into rvc-dev am: 19ecc1c95c am: 4bcfbb2a52

Browse Source 
Change-Id: Ie5b518738d0b91e8e2bdf5b25d150ac7d3690823
This commit is contained in:
Automerger Merge Worker
2020-03-13 20:50:56 +00:00
parent 5ad05bae8a 4bcfbb2a52
commit 4b7cb25495
3 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
api/system-current.txt
View File

@@ -9425,9 +9425,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";
@@ -11537,7 +11535,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);
@@ -11570,7 +11567,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();
@@ -11620,7 +11616,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();

2
core/java/android/provider/Telephony.java
View File

@@ -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;
/**

3
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -12465,7 +12465,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) {
@@ -12496,7 +12495,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,
@@ -12527,7 +12525,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,