diff options
| author | 2019-08-06 16:47:00 +0000 | |
|---|---|---|
| committer | 2019-08-06 16:47:00 +0000 | |
| commit | 80161fc4cb40342bde857737165f8b42f7639c0b (patch) | |
| tree | daf9b135333de3f2b2a01948d0088c4e748d7410 | |
| parent | 6a8adf5da21a6c742dcaaabe1bf1c08b32e9fdcc (diff) | |
| parent | 38d8e95833a3e3acb849a7791051d2c331be3dad (diff) | |
Merge "change from @hide to @SystemApi for wifi in CarrierConfig"
| -rw-r--r-- | api/system-current.txt | 8 | ||||
| -rwxr-xr-x | telephony/java/android/telephony/CarrierConfigManager.java | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 15b694ae6019..b4e655489865 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -7170,6 +7170,14 @@ package android.telephony { field public static final String KEY_CARRIER_SETUP_APP_STRING = "carrier_setup_app_string"; } + public static final class CarrierConfigManager.Wifi { + field public static final String KEY_CARRIER_CONNECTION_MANAGER_PACKAGE_STRING = "wifi.carrier_connection_manager_package_string"; + field public static final String KEY_CARRIER_PROFILES_VERSION_INT = "wifi.carrier_profiles_version_int"; + field public static final String KEY_NETWORK_PROFILES_STRING_ARRAY = "wifi.network_profiles_string_array"; + field public static final String KEY_PASSPOINT_PROFILES_STRING_ARRAY = "wifi.passpoint_profiles_string_array"; + field public static final String KEY_PREFIX = "wifi."; + } + public final class CarrierRestrictionRules implements android.os.Parcelable { method @NonNull public java.util.List<java.lang.Boolean> areCarrierIdentifiersAllowed(@NonNull java.util.List<android.service.carrier.CarrierIdentifier>); method public int describeContents(); diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index fb2c87a06bcd..9849ec73542b 100755 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -2931,10 +2931,10 @@ public class CarrierConfigManager { /** * Wi-Fi configs used in Carrier Wi-Fi application. - * TODO(b/132059890): Expose it in a future release as systemapi. * * @hide */ + @SystemApi public static final class Wifi { /** Prefix of all Wifi.KEY_* constants. */ public static final String KEY_PREFIX = "wifi."; |