diff options
| author | Danesh M <daneshm90@gmail.com> | 2015-11-17 13:19:06 -0800 |
|---|---|---|
| committer | Danesh M <daneshm90@gmail.com> | 2015-11-17 13:19:06 -0800 |
| commit | 0bc238e856f403635875b8f586b6ec42cf769662 (patch) | |
| tree | 80ebcd5eb24f0091a51dbd0fc1d1b1a3b3dfb6d7 /service | |
| parent | d81bef94d7675c8901d49c04a8758418dac265fa (diff) | |
| download | android_frameworks_opt_net_wifi-0bc238e856f403635875b8f586b6ec42cf769662.tar.gz android_frameworks_opt_net_wifi-0bc238e856f403635875b8f586b6ec42cf769662.tar.bz2 android_frameworks_opt_net_wifi-0bc238e856f403635875b8f586b6ec42cf769662.zip | |
Revert "wifi: Move WIFI_AUTO_CONNECT_TYPE to CMSettings."
This is a CAF feature.
Change-Id: I31116c4f04698565eee8bd1feb02053eebf3d674
Diffstat (limited to 'service')
| -rw-r--r-- | service/Android.mk | 2 | ||||
| -rw-r--r-- | service/java/com/android/server/wifi/WifiStateMachine.java | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/service/Android.mk b/service/Android.mk index 5b608a20d..8fddc9f43 100644 --- a/service/Android.mk +++ b/service/Android.mk @@ -126,7 +126,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, java) \ LOCAL_JNI_SHARED_LIBRARIES := libandroid_runtime LOCAL_JAVA_LIBRARIES := bouncycastle conscrypt services -LOCAL_STATIC_JAVA_LIBRARIES := ksoap2 android-support-v4 org.cyanogenmod.platform.sdk +LOCAL_STATIC_JAVA_LIBRARIES := ksoap2 android-support-v4 LOCAL_REQUIRED_MODULES := services LOCAL_MODULE_TAGS := LOCAL_MODULE := wifi-service diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java index 2ee7fb202..ee3cacd49 100644 --- a/service/java/com/android/server/wifi/WifiStateMachine.java +++ b/service/java/com/android/server/wifi/WifiStateMachine.java @@ -116,7 +116,6 @@ import com.android.server.wifi.hotspot2.NetworkDetail; import com.android.server.wifi.hotspot2.SupplicantBridge; import com.android.server.wifi.hotspot2.Utils; import com.android.server.wifi.p2p.WifiP2pServiceImpl; -import cyanogenmod.providers.CMSettings; import java.io.BufferedReader; import java.io.FileDescriptor; @@ -1325,8 +1324,8 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno } }); - mContext.getContentResolver().registerContentObserver(CMSettings.System.getUriFor( - CMSettings.System.WIFI_AUTO_CONNECT_TYPE), false, + mContext.getContentResolver().registerContentObserver(Settings.System.getUriFor( + Settings.System.WIFI_AUTO_CONNECT_TYPE), false, new ContentObserver(getHandler()) { @Override public void onChange(boolean selfChange) { @@ -10563,9 +10562,9 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno } boolean shouldAutoConnect() { - int autoConnectPolicy = CMSettings.System.getInt( + int autoConnectPolicy = Settings.System.getInt( mContext.getContentResolver(), - CMSettings.System.WIFI_AUTO_CONNECT_TYPE, + Settings.System.WIFI_AUTO_CONNECT_TYPE, WIFI_AUTO_CONNECT_TYPE_AUTO); if (DBG) { if (autoConnectPolicy == WIFI_AUTO_CONNECT_TYPE_AUTO) { |