Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80161fc4 authored by Steven Liu's avatar Steven Liu Committed by Android (Google) Code Review
Browse files

Merge "change from @hide to @SystemApi for wifi in CarrierConfig"

parents 6a8adf5d 38d8e958

api/system-current.txt

+8 −0
Original line number Diff line number Diff line
@@ -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();

































telephony/java/android/telephony/CarrierConfigManager.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -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.";