Merge "Remove Wifi APIs unused in AOSP." (983c3cc7) · Commits · e / os / android_frameworks_base

api/system-current.txt

+0 −8

Original line number	Diff line number	Diff line
		@@ -8568,14 +8568,6 @@ 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

+0 −54

Original line number	Diff line number	Diff line
		@@ -3188,59 +3188,6 @@ public class CarrierConfigManager {
		}
		}

		/**
		* Wi-Fi configs used in Carrier Wi-Fi application.
		*
		* @hide
		*/
		@SystemApi
		public static final class Wifi {
		/** Prefix of all Wifi.KEY_* constants. */
		public static final String KEY_PREFIX = "wifi.";

		/**
		* Whenever any information under wifi namespace is changed, the version should be
		* incremented by 1 so that the device is able to figure out the latest profiles based on
		* the version.
		*/
		public static final String KEY_CARRIER_PROFILES_VERSION_INT =
		KEY_PREFIX + "carrier_profiles_version_int";

		/**
		* It contains the package name of connection manager that the carrier owns.
		*
		* <P>Once it is installed, the profiles installed by Carrier Wi-Fi Application
		* will be deleted.
		* Once it is uninstalled, Carrier Wi-Fi Application will re-install the latest profiles.
		*/
		public static final String KEY_CARRIER_CONNECTION_MANAGER_PACKAGE_STRING =
		KEY_PREFIX + "carrier_connection_manager_package_string";
		/**
		* It is to have the list of wifi networks profiles which contain the information about
		* the wifi-networks to which carrier wants the device to connect.
		*/
		public static final String KEY_NETWORK_PROFILES_STRING_ARRAY =
		KEY_PREFIX + "network_profiles_string_array";

		/**
		* It is to have the list of Passpoint profiles which contain the information about
		* the Passpoint networks to which carrier wants the device to connect.
		*/
		public static final String KEY_PASSPOINT_PROFILES_STRING_ARRAY =
		KEY_PREFIX + "passpoint_profiles_string_array";

		private static PersistableBundle getDefaults() {
		PersistableBundle defaults = new PersistableBundle();
		defaults.putInt(KEY_CARRIER_PROFILES_VERSION_INT, -1);
		defaults.putString(KEY_CARRIER_CONNECTION_MANAGER_PACKAGE_STRING, null);
		defaults.putStringArray(KEY_NETWORK_PROFILES_STRING_ARRAY, null);
		defaults.putStringArray(KEY_PASSPOINT_PROFILES_STRING_ARRAY, null);
		return defaults;
		}

		private Wifi() {}
		}

		/**
		* An int array containing CDMA enhanced roaming indicator values for Home (non-roaming) network.
		* The default values come from 3GPP2 C.R1001 table 8.1-1.
		@@ -3821,7 +3768,6 @@ public class CarrierConfigManager {
		/* Default value is 60 seconds. */
		sDefaults.putLong(KEY_OPPORTUNISTIC_NETWORK_MAX_BACKOFF_TIME_LONG, 60000);
		sDefaults.putAll(Gps.getDefaults());
		sDefaults.putAll(Wifi.getDefaults());
		sDefaults.putIntArray(KEY_CDMA_ENHANCED_ROAMING_INDICATOR_FOR_HOME_NETWORK_INT_ARRAY,
		new int[] {
		1 /* Roaming Indicator Off */