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

Commit 910de945 authored by Chaohui Wang's avatar Chaohui Wang Committed by Android (Google) Code Review
Browse files

Merge "Update for AppOpsController changes"

parents f640bb1e 12b2f7cb

src/com/android/settings/spa/app/specialaccess/InstallUnknownApps.kt

+0 −2
Original line number Diff line number Diff line
@@ -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

                ),

        )

src/com/android/settings/spa/app/specialaccess/PictureInPicture.kt

+0 −2
Original line number Diff line number Diff line
@@ -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,

                ),

        )

src/com/android/settings/spa/app/specialaccess/WifiControlApps.kt

+3 −3
Original line number Diff line number Diff line
@@ -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

}