diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2015-05-14 03:25:20 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-14 03:25:22 +0000 |
| commit | c9be9f4d5bcf513654dbca24e648312d61e04bfc (patch) | |
| tree | 6d852d34fb7f1d552e1e8e6fee203d84908bf6ae /wifi/java/android | |
| parent | f578953eadb194833e18a52737691d3540b8b7fa (diff) | |
| parent | 976f044b2b3eff2ce968e3ea59022414180c268d (diff) | |
| download | frameworks_base-c9be9f4d5bcf513654dbca24e648312d61e04bfc.zip frameworks_base-c9be9f4d5bcf513654dbca24e648312d61e04bfc.tar.gz frameworks_base-c9be9f4d5bcf513654dbca24e648312d61e04bfc.tar.bz2 | |
Merge "Only activate the wifi alternate reality hack for KK and lower" into mnc-dev
Diffstat (limited to 'wifi/java/android')
| -rw-r--r-- | wifi/java/android/net/wifi/WifiManager.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java index 5e99672..85de1bf 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. * <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(); } |