From 12b2f7cbe99df53c9f4fe37ff5a41f8d80936ebe Mon Sep 17 00:00:00 2001 From: Chaohui Wang Date: Tue, 10 Jan 2023 15:33:55 +0800 Subject: [PATCH] Update for AppOpsController changes Bug: 235727273 Test: Manually with Settings Change-Id: Ic4f4d6354b471500ee727e513ff161f0ee1e3225 --- .../settings/spa/app/specialaccess/InstallUnknownApps.kt | 2 -- .../settings/spa/app/specialaccess/PictureInPicture.kt | 2 -- .../settings/spa/app/specialaccess/WifiControlApps.kt | 6 +++--- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/com/android/settings/spa/app/specialaccess/InstallUnknownApps.kt b/src/com/android/settings/spa/app/specialaccess/InstallUnknownApps.kt index 2d2dddf9f5d..43add1ffb91 100644 --- a/src/com/android/settings/spa/app/specialaccess/InstallUnknownApps.kt +++ b/src/com/android/settings/spa/app/specialaccess/InstallUnknownApps.kt @@ -19,7 +19,6 @@ package com.android.settings.spa.app.specialaccess import android.Manifest import android.app.AppGlobals import android.app.AppOpsManager.MODE_DEFAULT -import android.app.AppOpsManager.MODE_ERRORED import android.app.AppOpsManager.OP_REQUEST_INSTALL_PACKAGES import android.content.Context import android.content.pm.ApplicationInfo @@ -65,7 +64,6 @@ class InstallUnknownAppsListModel(private val context: Context) : context = context, app = app, op = OP_REQUEST_INSTALL_PACKAGES, - modeForNotAllowed = MODE_ERRORED ), ) diff --git a/src/com/android/settings/spa/app/specialaccess/PictureInPicture.kt b/src/com/android/settings/spa/app/specialaccess/PictureInPicture.kt index 994ee92ba53..56c16df1dae 100644 --- a/src/com/android/settings/spa/app/specialaccess/PictureInPicture.kt +++ b/src/com/android/settings/spa/app/specialaccess/PictureInPicture.kt @@ -16,7 +16,6 @@ package com.android.settings.spa.app.specialaccess -import android.app.AppOpsManager.MODE_ERRORED import android.app.AppOpsManager.OP_PICTURE_IN_PICTURE import android.content.Context import android.content.pm.ActivityInfo @@ -85,7 +84,6 @@ class PictureInPictureListModel(private val context: Context) : context = context, app = app, op = OP_PICTURE_IN_PICTURE, - modeForNotAllowed = MODE_ERRORED, ), ) diff --git a/src/com/android/settings/spa/app/specialaccess/WifiControlApps.kt b/src/com/android/settings/spa/app/specialaccess/WifiControlApps.kt index 69f7b1e1688..50bb5c9b9f6 100644 --- a/src/com/android/settings/spa/app/specialaccess/WifiControlApps.kt +++ b/src/com/android/settings/spa/app/specialaccess/WifiControlApps.kt @@ -32,8 +32,8 @@ object WifiControlAppListProvider : TogglePermissionAppListProvider { } class WifiControlAppListModel( - private val context: Context, - private val packageManagers: IPackageManagers = PackageManagers + context: Context, + packageManagers: IPackageManagers = PackageManagers ) : AppOpPermissionListModel(context, packageManagers) { override val pageTitleResId = R.string.change_wifi_state_title override val switchTitleResId = R.string.change_wifi_state_app_detail_switch @@ -44,6 +44,6 @@ class WifiControlAppListModel( /** NETWORK_SETTINGS permission trumps CHANGE_WIFI_CONFIG. */ override val broaderPermission = Manifest.permission.NETWORK_SETTINGS - override val permissionHasAppopFlag = false + override val permissionHasAppOpFlag = false override val modeForNotAllowed = MODE_IGNORED }