diff options
| author | Venkata Jagadeesh Garaga <quic_vgaraga@quicinc.com> | 2021-12-29 14:14:23 +0530 |
|---|---|---|
| committer | Venkata Jagadeesh Garaga <quic_vgaraga@quicinc.com> | 2021-12-31 09:55:44 +0530 |
| commit | fd7dee6840c7b620029ff37018eb510fa30ab85b (patch) | |
| tree | 2f4749966c655ccd1829ece6a4160c041ef32b75 | |
| parent | 7fc41b8e66256c07b1741b0cde2b48350b2d28ea (diff) | |
Use getSupplicantState API to get AP Connection state
getNetworkId used in Bluetooth to know the AP connection state
and it requires ACCESS_FINE_LOCATION permission. But when bluetooth
using ACCESS_FINE_LOCATION permission some GTS test cases failing.
Hence use getSupplicantState API and remove
ACCESS_FINE_LOCATION permission from Bluetooth APP
Change-Id: I9f16c3b50a2d01c6aeaa892bcbf2834d03ec0f07
CRs-Fixed: 3101591
| -rw-r--r-- | AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | src/com/android/bluetooth/btservice/AdapterService.java | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index c1ffea813..2c578ac58 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -20,7 +20,6 @@ <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 a75ed3778..24c672eec 100644 --- a/src/com/android/bluetooth/btservice/AdapterService.java +++ b/src/com/android/bluetooth/btservice/AdapterService.java @@ -174,6 +174,7 @@ import android.net.wifi.WifiManager; import android.net.NetworkInfo; import android.os.ParcelUuid; import android.net.wifi.SoftApConfiguration; +import android.net.wifi.SupplicantState; import com.google.protobuf.InvalidProtocolBufferException; @@ -410,10 +411,11 @@ public class AdapterService extends Service { WifiManager wifiMgr = (WifiManager) getSystemService(Context.WIFI_SERVICE); if ((wifiMgr != null) && (wifiMgr.isWifiEnabled())) { WifiInfo wifiInfo = wifiMgr.getConnectionInfo(); - if((wifiInfo != null) && (wifiInfo.getNetworkId() != -1)) { + if((wifiInfo != null) && (wifiInfo.getSupplicantState() == SupplicantState.COMPLETED)) { isWifiConnected = true; } } + Log.w(TAG,"fetchWifiState - isWifiConnected =" + isWifiConnected); mVendor.setWifiState(isWifiConnected); } |