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

Commit d8b9a804 authored by Lyn Han's avatar Lyn Han Committed by Automerger Merge Worker
Browse files

Merge "Remove GRANT_RUNTIME_PERMISSIONS from SpaPrivileged Manifest" into... 

Merge "Remove GRANT_RUNTIME_PERMISSIONS from SpaPrivileged Manifest" into udc-dev am: 72825706 am: eed13490

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23049476



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

packages/SettingsLib/SpaPrivileged/AndroidManifest.xml

+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>

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

+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())

    }

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

+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()

    }