Snap for 6261549 from 6011aabaa20ba801911378209101ad6da0ca1ddb to q-keystone-qcom-release
Change-Id: I487456de17a1eac7d079974853b9f8c6e7f5def1
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index bc10b4b..e435470 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -20,6 +20,7 @@
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission android:name="android.permission.ACCESS_BLUETOOTH_SHARE" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+ <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
diff --git a/src/com/android/bluetooth/btservice/AdapterService.java b/src/com/android/bluetooth/btservice/AdapterService.java
index ca54b91..d7c6469 100644
--- a/src/com/android/bluetooth/btservice/AdapterService.java
+++ b/src/com/android/bluetooth/btservice/AdapterService.java
@@ -3600,15 +3600,7 @@
debugLog(action);
if (action == null) return;
if (isEnabled() && (action.equals(WifiManager.NETWORK_STATE_CHANGED_ACTION))) {
- WifiManager wifiMgr = (WifiManager) getSystemService(Context.WIFI_SERVICE);
- if ((wifiMgr != null) && (wifiMgr.isWifiEnabled())) {
- WifiInfo wifiInfo = wifiMgr.getConnectionInfo();
- if ((wifiInfo != null) && (wifiInfo.getNetworkId() != -1)) {
- mVendor.setWifiState(true);
- } else {
- mVendor.setWifiState(false);
- }
- }
+ fetchWifiState();
} else if (isEnabled() &&
(action.equals(WifiManager.WIFI_STATE_CHANGED_ACTION) ||
(action.equals(WifiManager.WIFI_AP_STATE_CHANGED_ACTION)))){