diff --git a/src/androidTest/java/de/dennisguse/opentracks/TestUtil.java b/src/androidTest/java/de/dennisguse/opentracks/TestUtil.java index 947c6084a..184a5ac18 100644 --- a/src/androidTest/java/de/dennisguse/opentracks/TestUtil.java +++ b/src/androidTest/java/de/dennisguse/opentracks/TestUtil.java @@ -11,6 +11,9 @@ public class TestUtil { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { return GrantPermissionRule.grant(android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.BLUETOOTH_CONNECT, Manifest.permission.POST_NOTIFICATIONS); } - return GrantPermissionRule.grant(android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.BLUETOOTH_CONNECT); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { + return GrantPermissionRule.grant(android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.BLUETOOTH_CONNECT); + } + return GrantPermissionRule.grant(android.Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.BLUETOOTH, Manifest.permission.BLUETOOTH_ADMIN); } } diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index c0b67324d..ece98263e 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -41,8 +41,10 @@ limitations under the License. android:required="false" /> - - + + @@ -59,10 +61,13 @@ limitations under the License. - + - +