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

Commit b0ed625c authored by Priyanka Advani's avatar Priyanka Advani Committed by Android (Google) Code Review
Browse files

Revert "Fix NPEs in {AppId,Package}AppOpPolicy" 

Revert submission 25925437

Reason for revert: Probable culprit for b/320815151. Will be running through ABTD for confirming and before submitting the revert.

Reverted changes: /q/submissionid:25925437

Change-Id: Iac30c12eb0ef7b3e9e9db5fc27c128398dd92d81
parent cf93a3a3

services/permission/java/com/android/server/permission/access/appop/AppIdAppOpPolicy.kt

+0 −9
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.server.permission.access.appop



import android.app.AppOpsManager

import android.util.Slog

import com.android.server.permission.access.GetStateScope

import com.android.server.permission.access.MutableAccessState

import com.android.server.permission.access.MutateStateScope
@@ -85,10 +84,6 @@ class AppIdAppOpPolicy : BaseAppOpPolicy(AppIdAppOpPersistence()) { 
        appOpName: String,

        mode: Int

    ): Boolean {

        if (userId !in newState.userStates) {

            Slog.e(LOG_TAG, "Unable to set app op mode for missing user $userId")

            return false

        }

        val defaultMode = AppOpsManager.opToDefaultMode(appOpName)

        val oldMode =

            newState.userStates[userId]!!
@@ -157,8 +152,4 @@ class AppIdAppOpPolicy : BaseAppOpPolicy(AppIdAppOpPersistence()) { 
         */

        abstract fun onStateMutated()

    }



    companion object {

        private val LOG_TAG = AppIdAppOpPolicy::class.java.simpleName

    }

}

services/permission/java/com/android/server/permission/access/appop/PackageAppOpPolicy.kt

+0 −9
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.server.permission.access.appop



import android.app.AppOpsManager

import android.util.Slog

import com.android.server.permission.access.GetStateScope

import com.android.server.permission.access.MutableAccessState

import com.android.server.permission.access.MutateStateScope
@@ -88,10 +87,6 @@ class PackageAppOpPolicy : BaseAppOpPolicy(PackageAppOpPersistence()) { 
        appOpName: String,

        mode: Int

    ): Boolean {

        if (userId !in newState.userStates) {

            Slog.e(LOG_TAG, "Unable to set app op mode for missing user $userId")

            return false

        }

        val defaultMode = AppOpsManager.opToDefaultMode(appOpName)

        val oldMode =

            newState.userStates[userId]!!
@@ -160,8 +155,4 @@ class PackageAppOpPolicy : BaseAppOpPolicy(PackageAppOpPersistence()) { 
         */

        abstract fun onStateMutated()

    }



    companion object {

        private val LOG_TAG = PackageAppOpPolicy::class.java.simpleName

    }

}