Merge "Fixed incorrect merge service state" am: 30b14a9d70 (0ee8d6b3) · Commits · e / os / android_frameworks_base

telephony/java/android/telephony/ServiceState.java

+14 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2035,4 +2035,18 @@ public class ServiceState implements Parcelable {
	public void setIwlanPreferred(boolean isIwlanPreferred) {		public void setIwlanPreferred(boolean isIwlanPreferred) {
	mIsIwlanPreferred = isIwlanPreferred;		mIsIwlanPreferred = isIwlanPreferred;
	}		}

			/**
			* @return {@code true} if any data network is preferred on IWLAN.
			*
			* Note only when this value is true, {@link #getDataNetworkType()} will return
			* {@link TelephonyManager#NETWORK_TYPE_IWLAN} when AP-assisted mode device camps on both
			* cellular and IWLAN. This value does not affect legacy mode devices as the data network
			* type is directly reported by the modem.
			*
			* @hide
			*/
			public boolean isIwlanPreferred() {
			return mIsIwlanPreferred;
			}
	}		}