summaryrefslogtreecommitdiff
path: root/services/permission/java
diff options
context:
space:
mode:
author Evan Severson <evanseverson@google.com> 2022-12-14 19:21:08 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2022-12-14 19:21:08 +0000
commit8a9ed1970d75332b6012b552ec706aadf759594d (patch)
tree79ccfbd8f5c62bd089d1005db37611eb21f160b3 /services/permission/java
parented68e7147aac9503a10f425a2a539767c72e2324 (diff)
parent7bb6fbcb7c7707a1c22ab5eac3e160ca99940962 (diff)
Merge changes I30a3323d,If328baac
* changes: Rename AppOpsServiceInterface to AppOpsCheckingServiceInterface Move most of appops service code back into main class
Diffstat (limited to 'services/permission/java')
-rw-r--r--services/permission/java/com/android/server/permission/access/AccessCheckingService.kt2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/permission/java/com/android/server/permission/access/AccessCheckingService.kt b/services/permission/java/com/android/server/permission/access/AccessCheckingService.kt
index f648be9626b6..f493b8985c51 100644
--- a/services/permission/java/com/android/server/permission/access/AccessCheckingService.kt
+++ b/services/permission/java/com/android/server/permission/access/AccessCheckingService.kt
@@ -24,7 +24,7 @@ import com.android.server.SystemConfig
import com.android.server.SystemService
import com.android.server.appop.AppOpsCheckingServiceInterface
import com.android.server.permission.access.appop.AppOpService
-import com.android.server.permission.access.collection.* // ktlint-disable no-wildcard-imports
+import com.android.server.permission.access.collection.IntSet
import com.android.server.permission.access.permission.PermissionService
import com.android.server.pm.PackageManagerLocal
import com.android.server.pm.UserManagerService