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

Commit 988e6588 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix: CtsStatsdAtomHostTestCases test fail which caused by... 

Merge "Fix: CtsStatsdAtomHostTestCases test fail which caused by restorePermissions not reset AccessCheckDelegate in AppOpsService" into main am: 2d73a796 am: a5a99f21

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/3139074



Change-Id: Ie36ce03af8be2c36b5fb2f115f775ddf0347fbca
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ddce6f05 a5a99f21

framework/tests/util/src/Permissions.kt

+2 −0
Original line number Diff line number Diff line
@@ -64,6 +64,8 @@ object Permissions { 
    private fun restorePermissions(permissions: Set<String>) {

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

            uiAutomation.adoptShellPermissionIdentity()

        } else if (permissions.size == 0) {

            uiAutomation.dropShellPermissionIdentity()

        } else {

            uiAutomation.adoptShellPermissionIdentity(*permissions.map { it }.toTypedArray())

        }