From 976f044b2b3eff2ce968e3ea59022414180c268d Mon Sep 17 00:00:00 2001 From: Lorenzo Colitti Date: Wed, 13 May 2015 13:19:41 +0900 Subject: [PATCH] Only activate the wifi alternate reality hack for KK and lower Currently, the hack is activated for apps that target L or lower. Per discussion, we should activate the hack only for apps that target KK or lower. Apps that target L or above must instead use the appropriate multinetwork APIs to deal with this situation. Bug: 20081183 Change-Id: I29e1989e7a07aaabc10f604c20ecdc0d8b5366a3 --- wifi/java/android/net/wifi/WifiManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java index 5e996725007f8..85de1bf1d5b2c 100644 --- a/wifi/java/android/net/wifi/WifiManager.java +++ b/wifi/java/android/net/wifi/WifiManager.java @@ -757,7 +757,7 @@ public class WifiManager { * of state change events. *

* Note: 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(); }