Skip to content

Commit 80dcfa6

Browse files
committed
Fix permission rules to only apply at api level or above that it is needed
1 parent 0b0f350 commit 80dcfa6

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/TransportManagerTests.java

+1-5
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
public class TransportManagerTests {
3535

3636
@Rule
37-
public GrantPermissionRule btRuntimePermissionRule;
37+
public GrantPermissionRule btRuntimePermissionRule = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S ? GrantPermissionRule.grant(Manifest.permission.BLUETOOTH_CONNECT) : null;
3838
MultiplexTransportConfig config;
3939
final TransportRecord defaultBtRecord = new TransportRecord(TransportType.BLUETOOTH, "12:34:56:78:90");
4040
final ComponentName routerServiceComponentName = new ComponentName("com.smartdevicelink.test", "com.smartdevicelink.test.SdlRouterService");
@@ -68,10 +68,6 @@ public boolean onLegacyModeEnabled(String info) {
6868

6969
@Before
7070
public void setUp() throws Exception {
71-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
72-
btRuntimePermissionRule =
73-
GrantPermissionRule.grant(Manifest.permission.BLUETOOTH_CONNECT);
74-
}
7571
config = new MultiplexTransportConfig(getInstrumentation().getContext(), SdlUnitTestContants.TEST_APP_ID);
7672
config.setService(routerServiceComponentName);
7773
if (Looper.myLooper() == null) {

android/sdl_android/src/androidTest/java/com/smartdevicelink/util/MediaStreamingStatusTests.java

+1-4
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
@RunWith(AndroidJUnit4.class)
3838
public class MediaStreamingStatusTests {
3939
@Rule
40-
public GrantPermissionRule btRuntimePermissionRule;
40+
public GrantPermissionRule btRuntimePermissionRule = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S ? GrantPermissionRule.grant(Manifest.permission.BLUETOOTH_CONNECT) : null;
4141

4242
@Mock
4343
private AudioManager audioManager = mock(AudioManager.class);
@@ -63,9 +63,6 @@ public Object answer(InvocationOnMock invocation) {
6363

6464
@Before
6565
public void setUp() throws Exception {
66-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
67-
btRuntimePermissionRule = GrantPermissionRule.grant(Manifest.permission.BLUETOOTH_CONNECT);
68-
}
6966
mockedContext = mock(Context.class);
7067
doAnswer(onGetSystemService).when(mockedContext).getSystemService(Context.AUDIO_SERVICE);
7168
defaultMediaStreamingStatus = new MediaStreamingStatus(mockedContext, mock(MediaStreamingStatus.Callback.class));

0 commit comments

Comments
 (0)