PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update for AppOpsController changes

Browse Source 
Bug: 235727273
Test: Manually with Settings
Change-Id: Ic4f4d6354b471500ee727e513ff161f0ee1e3225
This commit is contained in:
Chaohui Wang
2023-01-10 15:33:55 +08:00
parent dc8f967315
commit 12b2f7cbe9
3 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/spa/app/specialaccess/InstallUnknownApps.kt
View File

@@ -19,7 +19,6 @@ package com.android.settings.spa.app.specialaccess
import android.Manifest import android.Manifest
import android.app.AppGlobals import android.app.AppGlobals
import android.app.AppOpsManager.MODE_DEFAULT import android.app.AppOpsManager.MODE_DEFAULT
import android.app.AppOpsManager.MODE_ERRORED
import android.app.AppOpsManager.OP_REQUEST_INSTALL_PACKAGES import android.app.AppOpsManager.OP_REQUEST_INSTALL_PACKAGES
import android.content.Context import android.content.Context
import android.content.pm.ApplicationInfo import android.content.pm.ApplicationInfo
@@ -65,7 +64,6 @@ class InstallUnknownAppsListModel(private val context: Context) :
context = context, context = context,
app = app, app = app,
op = OP_REQUEST_INSTALL_PACKAGES, op = OP_REQUEST_INSTALL_PACKAGES,
modeForNotAllowed = MODE_ERRORED
), ),
) )

2
src/com/android/settings/spa/app/specialaccess/PictureInPicture.kt
View File

@@ -16,7 +16,6 @@
package com.android.settings.spa.app.specialaccess package com.android.settings.spa.app.specialaccess
import android.app.AppOpsManager.MODE_ERRORED
import android.app.AppOpsManager.OP_PICTURE_IN_PICTURE import android.app.AppOpsManager.OP_PICTURE_IN_PICTURE
import android.content.Context import android.content.Context
import android.content.pm.ActivityInfo import android.content.pm.ActivityInfo
@@ -85,7 +84,6 @@ class PictureInPictureListModel(private val context: Context) :
context = context, context = context,
app = app, app = app,
op = OP_PICTURE_IN_PICTURE, op = OP_PICTURE_IN_PICTURE,
modeForNotAllowed = MODE_ERRORED,
), ),
) )

6
src/com/android/settings/spa/app/specialaccess/WifiControlApps.kt
View File

@@ -32,8 +32,8 @@ object WifiControlAppListProvider : TogglePermissionAppListProvider {
} }
class WifiControlAppListModel( class WifiControlAppListModel(
private val context: Context, context: Context,
private val packageManagers: IPackageManagers = PackageManagers packageManagers: IPackageManagers = PackageManagers
) : AppOpPermissionListModel(context, packageManagers) { ) : AppOpPermissionListModel(context, packageManagers) {
override val pageTitleResId = R.string.change_wifi_state_title override val pageTitleResId = R.string.change_wifi_state_title
override val switchTitleResId = R.string.change_wifi_state_app_detail_switch override val switchTitleResId = R.string.change_wifi_state_app_detail_switch
@@ -44,6 +44,6 @@ class WifiControlAppListModel(
/** NETWORK_SETTINGS permission trumps CHANGE_WIFI_CONFIG. */ /** NETWORK_SETTINGS permission trumps CHANGE_WIFI_CONFIG. */
override val broaderPermission = Manifest.permission.NETWORK_SETTINGS override val broaderPermission = Manifest.permission.NETWORK_SETTINGS
override val permissionHasAppopFlag = false override val permissionHasAppOpFlag = false
override val modeForNotAllowed = MODE_IGNORED override val modeForNotAllowed = MODE_IGNORED
} }