Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Lyn Han
2023-05-06 23:52:10 +00:00
committed by Android (Google) Code Review
parent d6a5b13008 8490adb3b3
commit 728257062b
3 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SettingsLib/SpaPrivileged/AndroidManifest.xml
View File

@@ -18,6 +18,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.settingslib.spaprivileged"> package="com.android.settingslib.spaprivileged">
<uses-permission android:name="android.permission.MANAGE_USERS" /> <uses-permission android:name="android.permission.MANAGE_USERS" />
<uses-permission android:name="android.permission.GRANT_RUNTIME_PERMISSIONS" />
</manifest> </manifest>

1
packages/SettingsLib/SpaPrivileged/tests/src/com/android/settingslib/spaprivileged/model/app/AppOpsControllerTest.kt
View File

@@ -55,6 +55,7 @@ class AppOpsControllerTest {
@Before @Before
fun setUp() { fun setUp() {
whenever(context.appOpsManager).thenReturn(appOpsManager) whenever(context.appOpsManager).thenReturn(appOpsManager)
whenever(context.packageManager).thenReturn(packageManager)
doNothing().`when`(packageManager) doNothing().`when`(packageManager)
.updatePermissionFlags(anyString(), anyString(), anyInt(), anyInt(), any()) .updatePermissionFlags(anyString(), anyString(), anyInt(), anyInt(), any())
} }

10
packages/SettingsLib/SpaPrivileged/tests/src/com/android/settingslib/spaprivileged/template/app/AppOpPermissionAppListTest.kt
View File

@@ -19,6 +19,7 @@ package com.android.settingslib.spaprivileged.template.app
import android.app.AppOpsManager import android.app.AppOpsManager
import android.content.Context import android.content.Context
import android.content.pm.ApplicationInfo import android.content.pm.ApplicationInfo
import android.content.pm.PackageManager
import androidx.compose.runtime.State import androidx.compose.runtime.State
import androidx.compose.ui.test.junit4.createComposeRule import androidx.compose.ui.test.junit4.createComposeRule
import androidx.lifecycle.MutableLiveData import androidx.lifecycle.MutableLiveData
@@ -38,6 +39,10 @@ import org.junit.Rule
import org.junit.Test import org.junit.Test
import org.junit.runner.RunWith import org.junit.runner.RunWith
import org.mockito.Mock 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.verify
import org.mockito.Mockito.`when` as whenever import org.mockito.Mockito.`when` as whenever
import org.mockito.Spy import org.mockito.Spy
@@ -57,11 +62,16 @@ class AppOpPermissionAppListTest {
@Mock private lateinit var appOpsManager: AppOpsManager @Mock private lateinit var appOpsManager: AppOpsManager
@Mock private lateinit var packageManager: PackageManager
private lateinit var listModel: TestAppOpPermissionAppListModel private lateinit var listModel: TestAppOpPermissionAppListModel
@Before @Before
fun setUp() { fun setUp() {
whenever(context.appOpsManager).thenReturn(appOpsManager) whenever(context.appOpsManager).thenReturn(appOpsManager)
whenever(context.packageManager).thenReturn(packageManager)
doNothing().`when`(packageManager)
.updatePermissionFlags(anyString(), anyString(), anyInt(), anyInt(), any())
listModel = TestAppOpPermissionAppListModel() listModel = TestAppOpPermissionAppListModel()
} }