Merge "Only activate the wifi alternate reality hack for KK and lower" into mnc-dev (c9be9f4d) · Commits · e / os / android_frameworks_base

wifi/java/android/net/wifi/WifiManager.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -757,7 +757,7 @@ public class WifiManager {
		* of state change events.
		* <p>
		* <b>Note:</b> If an application's target SDK version is
		* {@link android.os.Build.VERSION_CODES#MNC} or newer, network
		* {@link android.os.Build.VERSION_CODES#LOLLIPOP} or newer, network
		* communication may not use Wi-Fi even if Wi-Fi is connected; traffic may
		* instead be sent through another network, such as cellular data,
		* Bluetooth tethering, or Ethernet. For example, traffic will never use a
		@@ -776,7 +776,7 @@ public class WifiManager {
		* @return {@code true} if the operation succeeded
		*/
		public boolean enableNetwork(int netId, boolean disableOthers) {
		final boolean pin = disableOthers && mTargetSdkVersion < Build.VERSION_CODES.MNC;
		final boolean pin = disableOthers && mTargetSdkVersion < Build.VERSION_CODES.LOLLIPOP;
		if (pin) {
		registerPinningNetworkCallback();
		}