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

Commit 5f40594a authored by Atneya Nair's avatar Atneya Nair
Browse files

[audio] Fix audio permission fixed package names 

Despite a comment asserting so, these values were not actually in-sync
with the correct values in AppOps.

Correct them to be so. In particular, the shell mismatch could cause
issues for packages running in shell uid.

Test: atest NativePermissionControllerTest
Flag: com.android.media.audio.audioserver_permissions
Flag: EXEMPT bugfix
Fixes: 398023805
Change-Id: I16d9ff07609c8de32bce45d512683e43b69524f8
parent 1847a689

media/libaudiopermission/NativePermissionController.cpp

+2 −2
Original line number Diff line number Diff line
@@ -39,9 +39,9 @@ static std::optional<std::string> getFixedPackageName(uid_t uid) { 
        case AID_ROOT:

            return "root";

        case AID_SYSTEM:

            return "system";

            return "android";

        case AID_SHELL:

            return "shell";

            return "com.android.shell";

        case AID_MEDIA:

            return "media";

        case AID_AUDIOSERVER:

media/libaudiopermission/tests/NativePermissionControllerTest.cpp

+2 −2
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ TEST_F(NativePermissionControllerTest, getPackagesForUid_NotPopulated) { 
                IsErrorAnd(BinderStatusMatcher::hasException(EX_ILLEGAL_STATE)));



    // fixed uids should work

    EXPECT_THAT(controller_.getPackagesForUid(1000), IsOkAnd(ElementsAre(std::string{"system"})));

    EXPECT_THAT(controller_.getPackagesForUid(1000), IsOkAnd(ElementsAre(std::string{"android"})));

}



TEST_F(NativePermissionControllerTest, validateUidPackagePair_NotPopulated) {
@@ -66,7 +66,7 @@ TEST_F(NativePermissionControllerTest, validateUidPackagePair_NotPopulated) { 
                IsErrorAnd(BinderStatusMatcher::hasException(EX_ILLEGAL_STATE)));



    // fixed uids should work

    EXPECT_THAT(controller_.validateUidPackagePair(1000, "system"), IsOkAnd(IsTrue()));

    EXPECT_THAT(controller_.validateUidPackagePair(1000, "android"), IsOkAnd(IsTrue()));

}



// ---  Tests for populatePackagesForUids ----