Merge "Fix IWLAN operation mode description" am: 11e200697e am: 2fe75c2b77 (8d53f4cf) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/dataconnection/TransportManager.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -60,7 +60,7 @@ import java.util.stream.Collectors;
		*
		* The device can operate in the following modes, which is stored in the system properties
		* ro.telephony.iwlan_operation_mode. If the system properties is missing, then it's tied to
		* IRadio version. For 1.4 or above, it's legacy mode. For 1.3 or below, it's
		* IRadio version. For 1.4 or above, it's AP-assisted mdoe. For 1.3 or below, it's legacy mode.
		*
		* Legacy mode:
		* Frameworks send all data requests to the default data service, which is the cellular data
		@@ -75,13 +75,13 @@ import java.util.stream.Collectors;
		* frameworks to bind.
		*
		* Package name of data service:
		* The resource overlay 'config_wwan_data_service_package' or,
		* The resource overlay 'config_wlan_data_service_package' or,
		* the carrier config
		* {@link CarrierConfigManager#KEY_CARRIER_DATA_SERVICE_WLAN_PACKAGE_OVERRIDE_STRING}.
		* The carrier config takes precedence over the resource overlay if both exist.
		*
		* Package name of network service
		* The resource overlay 'config_wwan_network_service_package' or
		* The resource overlay 'config_wlan_network_service_package' or
		* the carrier config
		* {@link CarrierConfigManager#KEY_CARRIER_NETWORK_SERVICE_WLAN_PACKAGE_OVERRIDE_STRING}.
		* The carrier config takes precedence over the resource overlay if both exist.
		@@ -129,8 +129,8 @@ public class TransportManager extends Handler {
		public @interface IwlanOperationMode {}

		/**
		* IWLAN default mode. On device that has IRadio 1.3 or above, it means
		* {@link #IWLAN_OPERATION_MODE_AP_ASSISTED}. On device that has IRadio 1.2 or below, it means
		* IWLAN default mode. On device that has IRadio 1.4 or above, it means
		* {@link #IWLAN_OPERATION_MODE_AP_ASSISTED}. On device that has IRadio 1.3 or below, it means
		* {@link #IWLAN_OPERATION_MODE_LEGACY}.
		*/
		public static final String IWLAN_OPERATION_MODE_DEFAULT = "default";