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

Commit 72825706 authored by Lyn Han's avatar Lyn Han Committed by Android (Google) Code Review
Browse files

Merge "Remove GRANT_RUNTIME_PERMISSIONS from SpaPrivileged Manifest" into udc-dev

parents d6a5b130 8490adb3
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -18,6 +18,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
          package="com.android.settingslib.spaprivileged">
    <uses-permission android:name="android.permission.MANAGE_USERS" />
    <uses-permission android:name="android.permission.GRANT_RUNTIME_PERMISSIONS" />
</manifest>
+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ class AppOpsControllerTest {
    @Before
    fun setUp() {
        whenever(context.appOpsManager).thenReturn(appOpsManager)
        whenever(context.packageManager).thenReturn(packageManager)
        doNothing().`when`(packageManager)
                .updatePermissionFlags(anyString(), anyString(), anyInt(), anyInt(), any())
    }
+10 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.settingslib.spaprivileged.template.app
import android.app.AppOpsManager
import android.content.Context
import android.content.pm.ApplicationInfo
import android.content.pm.PackageManager
import androidx.compose.runtime.State
import androidx.compose.ui.test.junit4.createComposeRule
import androidx.lifecycle.MutableLiveData
@@ -38,6 +39,10 @@ import org.junit.Rule
import org.junit.Test
import org.junit.runner.RunWith
import org.mockito.Mock
import org.mockito.Mockito.any
import org.mockito.Mockito.anyInt
import org.mockito.Mockito.anyString
import org.mockito.Mockito.doNothing
import org.mockito.Mockito.verify
import org.mockito.Mockito.`when` as whenever
import org.mockito.Spy
@@ -57,11 +62,16 @@ class AppOpPermissionAppListTest {

    @Mock private lateinit var appOpsManager: AppOpsManager

    @Mock private lateinit var packageManager: PackageManager

    private lateinit var listModel: TestAppOpPermissionAppListModel

    @Before
    fun setUp() {
        whenever(context.appOpsManager).thenReturn(appOpsManager)
        whenever(context.packageManager).thenReturn(packageManager)
        doNothing().`when`(packageManager)
                .updatePermissionFlags(anyString(), anyString(), anyInt(), anyInt(), any())
        listModel = TestAppOpPermissionAppListModel()
    }