Injected proper deps in PrivacyItemController
Test: atest
Change-Id: Ib12d5d6af0f8cfacbb91a2e2cd1887f337a1d61e
Fixes: 121388507
diff --git a/packages/SystemUI/src/com/android/systemui/privacy/PrivacyItemController.kt b/packages/SystemUI/src/com/android/systemui/privacy/PrivacyItemController.kt
index faeacf7..0f33937 100644
--- a/packages/SystemUI/src/com/android/systemui/privacy/PrivacyItemController.kt
+++ b/packages/SystemUI/src/com/android/systemui/privacy/PrivacyItemController.kt
@@ -26,16 +26,23 @@
import android.os.UserHandle
import android.os.UserManager
import com.android.internal.annotations.VisibleForTesting
-import com.android.systemui.Dependency
+import com.android.systemui.Dependency.BG_HANDLER_NAME
+import com.android.systemui.Dependency.MAIN_HANDLER_NAME
+import com.android.systemui.R
import com.android.systemui.appops.AppOpItem
import com.android.systemui.appops.AppOpsController
-import com.android.systemui.R
import java.lang.ref.WeakReference
import javax.inject.Inject
+import javax.inject.Named
import javax.inject.Singleton
@Singleton
-class PrivacyItemController @Inject constructor(private val context: Context) {
+class PrivacyItemController @Inject constructor(
+ val context: Context,
+ private val appOpsController: AppOpsController,
+ @Named(MAIN_HANDLER_NAME) private val uiHandler: Handler,
+ @Named(BG_HANDLER_NAME) private val bgHandler: Handler
+) {
companion object {
val OPS = intArrayOf(AppOpsManager.OP_CAMERA,
@@ -48,16 +55,10 @@
const val TAG = "PrivacyItemController"
const val SYSTEM_UID = 1000
}
- private var privacyList = emptyList<PrivacyItem>()
- @Suppress("DEPRECATION")
- private val appOpsController = Dependency.get(AppOpsController::class.java)
+ private var privacyList = emptyList<PrivacyItem>()
private val userManager = context.getSystemService(UserManager::class.java)
private var currentUserIds = emptyList<Int>()
- @Suppress("DEPRECATION")
- private val bgHandler = Handler(Dependency.get(Dependency.BG_LOOPER))
- @Suppress("DEPRECATION")
- private val uiHandler = Dependency.get(Dependency.MAIN_HANDLER)
private var listening = false
val systemApp =
PrivacyApplication(context.getString(R.string.device_services), SYSTEM_UID, context)