diff options
| author | Danesh M <daneshm90@gmail.com> | 2015-11-17 13:20:58 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2015-11-17 13:20:58 -0800 |
| commit | 661e0e9f709e27abc6be950263d7241d1402f63f (patch) | |
| tree | 4e91d5cbc02d20f50bcbdd1ef07e0b51c82efff2 /service/java | |
| parent | 41c17381cc0bc790afff560f57e0a81cf3a436c7 (diff) | |
| parent | 0bc238e856f403635875b8f586b6ec42cf769662 (diff) | |
| download | android_frameworks_opt_net_wifi-661e0e9f709e27abc6be950263d7241d1402f63f.tar.gz android_frameworks_opt_net_wifi-661e0e9f709e27abc6be950263d7241d1402f63f.tar.bz2 android_frameworks_opt_net_wifi-661e0e9f709e27abc6be950263d7241d1402f63f.zip | |
Merge "Revert "wifi: Move WIFI_AUTO_CONNECT_TYPE to CMSettings."" into cm-13.0
Diffstat (limited to 'service/java')
| -rw-r--r-- | service/java/com/android/server/wifi/WifiStateMachine.java | 9 |
1 files changed, 4 insertions, 5 deletions
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) { |