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

Commit fbcd5586 authored by Jack Yu's avatar Jack Yu Committed by android-build-merger
Browse files

Merge "Fixed incorrect merge service state"

am: 30b14a9d

Change-Id: I2e9c8c15b0b224ebdff1d8bec2fa63721558ecd6
parents df9fb2aa 30b14a9d
Loading
Loading
Loading
Loading
+14 −0
Original line number Diff line number Diff line
@@ -1997,4 +1997,18 @@ public class ServiceState implements Parcelable {
    public void setIwlanPreferred(boolean 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;
    }
}