From d3ef31f0c37a12a85b1526b66bbc7d6e6e91cb30 Mon Sep 17 00:00:00 2001 From: Fabian Kozynski Date: Fri, 18 Sep 2020 16:11:13 +0000 Subject: [PATCH] [DO NOT MERGE] Revert "Enable mic & camera by default" This reverts commit b4908e9b881f92aba788262c8c54ec57dd8fba4d. Reason for revert: Not needed Change-Id: I39036d1697804493b92074ee5f40c6779a029aa5 Bug: 162547999 --- .../systemui/privacy/PrivacyItemController.kt | 11 ++---- .../privacy/PrivacyItemControllerFlagsTest.kt | 39 +++++++++++-------- .../privacy/PrivacyItemControllerTest.kt | 1 - 3 files changed, 26 insertions(+), 25 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/privacy/PrivacyItemController.kt b/packages/SystemUI/src/com/android/systemui/privacy/PrivacyItemController.kt index a46ecaff77190..59118bf3534e2 100644 --- a/packages/SystemUI/src/com/android/systemui/privacy/PrivacyItemController.kt +++ b/packages/SystemUI/src/com/android/systemui/privacy/PrivacyItemController.kt @@ -72,8 +72,6 @@ class PrivacyItemController @Inject constructor( private const val ALL_INDICATORS = SystemUiDeviceConfigFlags.PROPERTY_PERMISSIONS_HUB_ENABLED private const val MIC_CAMERA = SystemUiDeviceConfigFlags.PROPERTY_MIC_CAMERA_ENABLED - private const val DEFAULT_ALL_INDICATORS = false - private const val DEFAULT_MIC_CAMERA = true } @VisibleForTesting @@ -83,12 +81,12 @@ class PrivacyItemController @Inject constructor( fun isAllIndicatorsEnabled(): Boolean { return deviceConfigProxy.getBoolean(DeviceConfig.NAMESPACE_PRIVACY, - ALL_INDICATORS, DEFAULT_ALL_INDICATORS) + ALL_INDICATORS, false) } private fun isMicCameraEnabled(): Boolean { return deviceConfigProxy.getBoolean(DeviceConfig.NAMESPACE_PRIVACY, - MIC_CAMERA, DEFAULT_MIC_CAMERA) + MIC_CAMERA, false) } private var currentUserIds = emptyList() @@ -120,13 +118,12 @@ class PrivacyItemController @Inject constructor( // Running on the ui executor so can iterate on callbacks if (properties.keyset.contains(ALL_INDICATORS)) { - allIndicatorsAvailable = properties.getBoolean(ALL_INDICATORS, - DEFAULT_ALL_INDICATORS) + allIndicatorsAvailable = properties.getBoolean(ALL_INDICATORS, false) callbacks.forEach { it.get()?.onFlagAllChanged(allIndicatorsAvailable) } } if (properties.keyset.contains(MIC_CAMERA)) { - micCameraAvailable = properties.getBoolean(MIC_CAMERA, DEFAULT_MIC_CAMERA) + micCameraAvailable = properties.getBoolean(MIC_CAMERA, false) callbacks.forEach { it.get()?.onFlagMicCameraChanged(micCameraAvailable) } } internalUiExecutor.updateListeningState() diff --git a/packages/SystemUI/tests/src/com/android/systemui/privacy/PrivacyItemControllerFlagsTest.kt b/packages/SystemUI/tests/src/com/android/systemui/privacy/PrivacyItemControllerFlagsTest.kt index 25fb7d300b8fc..4ba29e6e02a61 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/privacy/PrivacyItemControllerFlagsTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/privacy/PrivacyItemControllerFlagsTest.kt @@ -96,24 +96,22 @@ class PrivacyItemControllerFlagsTest : SysuiTestCase() { } @Test - fun testNotListeningAllByDefault() { + fun testNotListeningByDefault() { assertFalse(privacyItemController.allIndicatorsAvailable) - } + assertFalse(privacyItemController.micCameraAvailable) - @Test - fun testMicCameraListeningByDefault() { - assertTrue(privacyItemController.micCameraAvailable) + verify(appOpsController, never()).addCallback(any(), any()) } @Test fun testMicCameraChanged() { - changeMicCamera(false) // default is true + changeMicCamera(true) executor.runAllReady() - verify(callback).onFlagMicCameraChanged(false) + verify(callback).onFlagMicCameraChanged(true) verify(callback, never()).onFlagAllChanged(anyBoolean()) - assertFalse(privacyItemController.micCameraAvailable) + assertTrue(privacyItemController.micCameraAvailable) assertFalse(privacyItemController.allIndicatorsAvailable) } @@ -126,19 +124,20 @@ class PrivacyItemControllerFlagsTest : SysuiTestCase() { verify(callback, never()).onFlagMicCameraChanged(anyBoolean()) assertTrue(privacyItemController.allIndicatorsAvailable) + assertFalse(privacyItemController.micCameraAvailable) } @Test fun testBothChanged() { changeAll(true) - changeMicCamera(false) + changeMicCamera(true) executor.runAllReady() verify(callback, atLeastOnce()).onFlagAllChanged(true) - verify(callback, atLeastOnce()).onFlagMicCameraChanged(false) + verify(callback, atLeastOnce()).onFlagMicCameraChanged(true) assertTrue(privacyItemController.allIndicatorsAvailable) - assertFalse(privacyItemController.micCameraAvailable) + assertTrue(privacyItemController.micCameraAvailable) } @Test @@ -157,12 +156,19 @@ class PrivacyItemControllerFlagsTest : SysuiTestCase() { verify(appOpsController).addCallback(eq(PrivacyItemController.OPS), any()) } + @Test + fun testAll_listening() { + changeAll(true) + executor.runAllReady() + + verify(appOpsController).addCallback(eq(PrivacyItemController.OPS), any()) + } + @Test fun testAllFalse_notListening() { changeAll(true) executor.runAllReady() changeAll(false) - changeMicCamera(false) executor.runAllReady() verify(appOpsController).removeCallback(any(), any()) @@ -170,8 +176,8 @@ class PrivacyItemControllerFlagsTest : SysuiTestCase() { @Test fun testSomeListening_stillListening() { - // Mic and camera are true by default changeAll(true) + changeMicCamera(true) executor.runAllReady() changeAll(false) executor.runAllReady() @@ -180,8 +186,7 @@ class PrivacyItemControllerFlagsTest : SysuiTestCase() { } @Test - fun testAllDeleted_micCameraFalse_stopListening() { - changeMicCamera(false) + fun testAllDeleted_stopListening() { changeAll(true) executor.runAllReady() changeAll(null) @@ -191,13 +196,13 @@ class PrivacyItemControllerFlagsTest : SysuiTestCase() { } @Test - fun testMicDeleted_stillListening() { + fun testMicDeleted_stopListening() { changeMicCamera(true) executor.runAllReady() changeMicCamera(null) executor.runAllReady() - verify(appOpsController, never()).removeCallback(any(), any()) + verify(appOpsController).removeCallback(any(), any()) } private fun changeMicCamera(value: Boolean?) = changeProperty(MIC_CAMERA, value) diff --git a/packages/SystemUI/tests/src/com/android/systemui/privacy/PrivacyItemControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/privacy/PrivacyItemControllerTest.kt index 38e8823adfbb5..5c5df2639cdd9 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/privacy/PrivacyItemControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/privacy/PrivacyItemControllerTest.kt @@ -272,7 +272,6 @@ class PrivacyItemControllerTest : SysuiTestCase() { @Test fun testNotListeningWhenIndicatorsDisabled() { changeAll(false) - changeMicCamera(false) privacyItemController.addCallback(callback) executor.runAllReady() verify(appOpsController, never()).addCallback(eq(PrivacyItemController.OPS),