commit eb446a306b76ff2bdf797720465c3a9eb3f1be36
author panliming-tuya <smarxpan@163.com> Mon Nov 21 07:09:05 2022 +0800
committer GitHub <noreply@github.com> Sun Nov 20 15:09:05 2022 -0800
tree b99eb857d7130ed22312f381fb3ff4135c963413
parent 1bcbcfaee1f60aceb831abedabe4732f24a84ff0

[Android] Fix location permission check below Android 12 (#23567)

examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/SelectActionFragment.kt

diff --git a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/SelectActionFragment.kt b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/SelectActionFragment.kt
index 4f5b910..263e979 100644
--- a/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/SelectActionFragment.kt
+++ b/examples/android/CHIPTool/app/src/main/java/com/google/chip/chiptool/SelectActionFragment.kt
@@ -109,15 +109,21 @@
   }
 
   private fun hasLocationPermission(): Boolean {
-    val locationPermissionState =
-      ContextCompat.checkSelfPermission(requireContext(), Manifest.permission.ACCESS_FINE_LOCATION)
-    var blePermissionState = 1
+    val locationPermissionGranted =
+      ContextCompat.checkSelfPermission(
+        requireContext(),
+        Manifest.permission.ACCESS_FINE_LOCATION
+      ) == PackageManager.PERMISSION_GRANTED
+
+    // Android 12 new permission
+    var bleScanPermissionGranted = true
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-      blePermissionState =
-        ContextCompat.checkSelfPermission(requireContext(), Manifest.permission.BLUETOOTH_SCAN)
+      bleScanPermissionGranted =
+        ContextCompat.checkSelfPermission(requireContext(), Manifest.permission.BLUETOOTH_SCAN) ==
+          PackageManager.PERMISSION_GRANTED
     }
 
-    return PackageManager.PERMISSION_GRANTED == (locationPermissionState + blePermissionState)
+    return locationPermissionGranted && bleScanPermissionGranted
   }