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

Merge "Revert "[Settings] Remove CarrierConfigManager.Apn.KEY_PREFIX from API"" into sc-dev am: 52e885a65b

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13640526

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I29b57ce61a123c5316b0a13df781a20bbf02870e
This commit is contained in:
Tom Hsu
2021-02-26 04:16:40 +00:00
committed by Automerger Merge Worker
parent 8e87eab662 52e885a65b
commit 7e16ba745c
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/api/current.txt
View File

@@ -40883,6 +40883,7 @@ package android.telephony {
}
public static final class CarrierConfigManager.Apn {
field @Deprecated public static final String KEY_PREFIX = "apn.";
field public static final String KEY_SETTINGS_DEFAULT_PROTOCOL_STRING = "apn.settings_default_protocol_string";
field public static final String KEY_SETTINGS_DEFAULT_ROAMING_PROTOCOL_STRING = "apn.settings_default_roaming_protocol_string";
field public static final String PROTOCOL_IPV4 = "IP";

10
telephony/java/android/telephony/CarrierConfigManager.java
View File

@@ -1717,8 +1717,14 @@ public class CarrierConfigManager {
* Configs used for APN setup.
*/
public static final class Apn {
/** Prefix of all Apn.KEY_* constants. */
private static final String KEY_PREFIX = "apn.";
/**
* Prefix of all Apn.KEY_* constants.
*
* @deprecated Since KEY_PREFIX is unnecessary to public, it will modify to private
* next android generation.
*/
@Deprecated
public static final String KEY_PREFIX = "apn.";
/** IPv4 internet protocol */
public static final String PROTOCOL_IPV4 = "IP";