diff options
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/appops/AppOpsControllerImpl.java | 10 | ||||
| -rw-r--r-- | packages/SystemUI/tests/src/com/android/systemui/appops/AppOpsControllerTest.java | 6 |
2 files changed, 12 insertions, 4 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/appops/AppOpsControllerImpl.java b/packages/SystemUI/src/com/android/systemui/appops/AppOpsControllerImpl.java index f616d57e90aa..139bfd55eab7 100644 --- a/packages/SystemUI/src/com/android/systemui/appops/AppOpsControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/appops/AppOpsControllerImpl.java @@ -28,6 +28,7 @@ import android.util.Log; import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; +import com.android.systemui.DumpController; import com.android.systemui.Dumpable; import com.android.systemui.dagger.qualifiers.BgLooper; @@ -77,12 +78,14 @@ public class AppOpsControllerImpl implements AppOpsController, }; @Inject - public AppOpsControllerImpl(Context context, @BgLooper Looper bgLooper) { - this(context, bgLooper, new PermissionFlagsCache(context)); + public AppOpsControllerImpl(Context context, @BgLooper Looper bgLooper, + DumpController dumpController) { + this(context, bgLooper, new PermissionFlagsCache(context), dumpController); } @VisibleForTesting - protected AppOpsControllerImpl(Context context, Looper bgLooper, PermissionFlagsCache cache) { + protected AppOpsControllerImpl(Context context, Looper bgLooper, PermissionFlagsCache cache, + DumpController dumpController) { mContext = context; mAppOps = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE); mFlagsCache = cache; @@ -91,6 +94,7 @@ public class AppOpsControllerImpl implements AppOpsController, for (int i = 0; i < numOps; i++) { mCallbacksByCode.put(OPS[i], new ArraySet<>()); } + dumpController.registerDumpable(TAG, this); } @VisibleForTesting diff --git a/packages/SystemUI/tests/src/com/android/systemui/appops/AppOpsControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/appops/AppOpsControllerTest.java index 540ac843ad8e..26185e101346 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/appops/AppOpsControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/appops/AppOpsControllerTest.java @@ -39,6 +39,7 @@ import android.testing.TestableLooper; import androidx.test.filters.SmallTest; +import com.android.systemui.DumpController; import com.android.systemui.SysuiTestCase; import org.junit.Before; @@ -66,6 +67,8 @@ public class AppOpsControllerTest extends SysuiTestCase { private AppOpsControllerImpl.H mMockHandler; @Mock private PermissionFlagsCache mFlagsCache; + @Mock + private DumpController mDumpController; private AppOpsControllerImpl mController; private TestableLooper mTestableLooper; @@ -89,7 +92,8 @@ public class AppOpsControllerTest extends SysuiTestCase { when(mFlagsCache.getPermissionFlags(anyString(), anyString(), eq(UserHandle.getUserHandleForUid(TEST_UID_NON_USER_SENSITIVE)))).thenReturn(0); - mController = new AppOpsControllerImpl(mContext, mTestableLooper.getLooper(), mFlagsCache); + mController = new AppOpsControllerImpl(mContext, mTestableLooper.getLooper(), mFlagsCache, + mDumpController); } @Test |