Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56516df6 authored by Jack He's avatar Jack He
Browse files

bt-test-utils-lib: Handle UiAutomation.ALL_PERMISSIONS 

* getAdoptedShellPermissions() will return ALL_PERMISSIONS instead of
  null or empty array when all permissions are adopted
* This needs to be handled specially in our code

Test: atest BumbleBluetoothTests
Bug: 300052980
Change-Id: I0385b44c00ba6db9d461b660bddd6685a3a9f2a1
parent 4baea41f

framework/tests/util/src/android/bluetooth/test_utils/BluetoothAdapterUtils.java

+7 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package android.bluetooth.test_utils; 
import static android.Manifest.permission.BLUETOOTH_CONNECT;

import static android.Manifest.permission.BLUETOOTH_PRIVILEGED;



import android.app.UiAutomation;

import android.bluetooth.BluetoothAdapter;

import android.content.BroadcastReceiver;

import android.content.Context;
@@ -227,6 +228,9 @@ public class BluetoothAdapterUtils { 


        Set<String> permissionsAdopted = TestUtils.getAdoptedShellPermissions();

        String[] permissionArray = permissionsAdopted.toArray(String[]::new);

        if (UiAutomation.ALL_PERMISSIONS.equals(permissionsAdopted)) {

            permissionArray = null;

        }



        sBluetoothAdapterLock.lock();

        try {
@@ -267,6 +271,9 @@ public class BluetoothAdapterUtils { 


        Set<String> permissionsAdopted = TestUtils.getAdoptedShellPermissions();

        String[] permissionArray = permissionsAdopted.toArray(String[]::new);

        if (UiAutomation.ALL_PERMISSIONS.equals(permissionsAdopted)) {

            permissionArray = null;

        }



        sBluetoothAdapterLock.lock();

        try {