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

Commit 4cd95246 authored by Nate Myren's avatar Nate Myren
Browse files

Add Grant/Revoke tests 

Add tests for the KotlinUtils grant/revoke methods

Test: atest GrantRevokeTests, or
m GooglePermissionControllerUnitTests && adb install ~/InternalMaster/out/target/product/blueline/testcases/GooglePermissionControllerUnitTests/arm64/GooglePermissionControllerUnitTests.apk && adb shell am instrument -w com.google.android.permissioncontroller.tests.unit && adb uninstall com.google.android.permissioncontroller.tests.unit

Change-Id: Ic421027f911a2a166a42dd64d06db0c86e268e9a
parent 008c51b8

src/com/android/permissioncontroller/permission/utils/KotlinUtils.kt

+6 −9
Original line number Diff line number Diff line
@@ -359,8 +359,8 @@ object KotlinUtils { 
        }



        if (shouldKillForAnyPermission) {

            app.getSystemService(ActivityManager::class.java)!!.killUid(group.packageInfo.uid,

                KILL_REASON_APP_OP_CHANGE)

            (app.getSystemService(ActivityManager::class.java) as ActivityManager).killUid(

                group.packageInfo.uid, KILL_REASON_APP_OP_CHANGE)

        }

        return LightAppPermGroup(group.packageInfo, group.permGroupInfo, newPerms,

            group.hasInstallToRuntimeSplit, group.specialLocationGrant)
@@ -525,8 +525,8 @@ object KotlinUtils { 
        }



        if (shouldKillForAnyPermission) {

            app.getSystemService(ActivityManager::class.java)!!.killUid(group.packageInfo.uid,

                KILL_REASON_APP_OP_CHANGE)

            (app.getSystemService(ActivityManager::class.java) as ActivityManager).killUid(

                group.packageInfo.uid, KILL_REASON_APP_OP_CHANGE)

        }

        return LightAppPermGroup(group.packageInfo, group.permGroupInfo, newPerms,

            group.hasInstallToRuntimeSplit, group.specialLocationGrant)
@@ -644,9 +644,7 @@ object KotlinUtils { 
    ): Boolean {

        val packageName = group.packageInfo.packageName

        val uid = group.packageInfo.uid

        val user = UserHandle.getUserHandleForUid(uid)

        val appOpsManager = Utils.getUserContext(app, user).getSystemService(

            AppOpsManager::class.java)!!

        val appOpsManager = app.getSystemService(AppOpsManager::class.java) as AppOpsManager

        var wasChanged = false



        if (perm.isBackgroundPermission && perm.foregroundPerms != null) {
@@ -709,8 +707,7 @@ object KotlinUtils { 
    ): Boolean {

        val packageName = group.packageInfo.packageName

        val uid = group.packageInfo.uid

        val appOpsManager = app.getSystemService(

            AppOpsManager::class.java)!!

        val appOpsManager = app.getSystemService(AppOpsManager::class.java) as AppOpsManager

        var wasChanged = false



        if (perm.isBackgroundPermission && perm.foregroundPerms != null) {

tests/unit/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ android_test { 


    name: "PermissionControllerUnitTests",



    srcs: ["src/**/*.java"],

    srcs: ["src/**/*.java", "src/**/*.kt"],



    libs: [

        "android.test.base",

tests/unit/AndroidManifest.xml

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
    package="com.android.permissioncontroller.tests.unit">



    <application android:label="PermissionController Unit Tests">



        <uses-library android:name="android.test.runner" />

    </application>

tests/unit/AndroidTest.xml

+6 −1
Original line number Diff line number Diff line
@@ -25,7 +25,12 @@ 
        <option name="cleanup-apks" value="true" />

    </target_preparer>

    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >

        <option name="package" value="com.android.permissioncontroller.tests.unit" />

        <option name="package" value="com.android.permissioncontroller.tests.unit.role" />

        <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />

        <option name="hidden-api-checks" value="false"/>

    </test>

    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >

        <option name="package" value="com.android.permissioncontroller.tests.unit.permissions" />

        <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />

        <option name="hidden-api-checks" value="false"/>

    </test>

tests/unit/src/com/android/permissioncontroller/tests/unit/permissions/GrantRevokeTests.kt

0 → 100644
+1055 −0

File added.

Preview size limit exceeded, changes collapsed.