Fix permission rules to only apply at api level or above that it is n…

…eeded
smartdevicelink · Feb 13, 2024 · 80dcfa6 · 80dcfa6
1 parent 0b0f350
commit 80dcfa6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/...sdl_android/src/androidTest/java/com/smartdevicelink/transport/TransportManagerTests.java b/...sdl_android/src/androidTest/java/com/smartdevicelink/transport/TransportManagerTests.java
@@ -34,7 +34,7 @@
 public class TransportManagerTests {
 
     @Rule
-    public GrantPermissionRule btRuntimePermissionRule;
+    public GrantPermissionRule btRuntimePermissionRule = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S ? GrantPermissionRule.grant(Manifest.permission.BLUETOOTH_CONNECT) : null;
     MultiplexTransportConfig config;
     final TransportRecord defaultBtRecord = new TransportRecord(TransportType.BLUETOOTH, "12:34:56:78:90");
     final ComponentName routerServiceComponentName = new ComponentName("com.smartdevicelink.test", "com.smartdevicelink.test.SdlRouterService");
@@ -68,10 +68,6 @@ public boolean onLegacyModeEnabled(String info) {
 
     @Before
     public void setUp() throws Exception {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-            btRuntimePermissionRule =
-                    GrantPermissionRule.grant(Manifest.permission.BLUETOOTH_CONNECT);
-        }
         config = new MultiplexTransportConfig(getInstrumentation().getContext(), SdlUnitTestContants.TEST_APP_ID);
         config.setService(routerServiceComponentName);
         if (Looper.myLooper() == null) {

diff --git a/.../sdl_android/src/androidTest/java/com/smartdevicelink/util/MediaStreamingStatusTests.java b/.../sdl_android/src/androidTest/java/com/smartdevicelink/util/MediaStreamingStatusTests.java
@@ -37,7 +37,7 @@
 @RunWith(AndroidJUnit4.class)
 public class MediaStreamingStatusTests {
     @Rule
-    public GrantPermissionRule btRuntimePermissionRule;
+    public GrantPermissionRule btRuntimePermissionRule = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S ? GrantPermissionRule.grant(Manifest.permission.BLUETOOTH_CONNECT) : null;
 
     @Mock
     private AudioManager audioManager = mock(AudioManager.class);
@@ -63,9 +63,6 @@ public Object answer(InvocationOnMock invocation) {
 
     @Before
     public void setUp() throws Exception {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-            btRuntimePermissionRule = GrantPermissionRule.grant(Manifest.permission.BLUETOOTH_CONNECT);
-        }
         mockedContext = mock(Context.class);
         doAnswer(onGetSystemService).when(mockedContext).getSystemService(Context.AUDIO_SERVICE);
         defaultMediaStreamingStatus = new MediaStreamingStatus(mockedContext, mock(MediaStreamingStatus.Callback.class));