Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not hard code camera/mic icons to enabled, but default to enabled

Browse Source 
Bug: 177915805
Test: Build
Change-Id: Icc61c280d6833b72e67e06cbc6d4ea4f67134f9d
This commit is contained in:
Nate Myren
2021-01-19 10:58:40 -08:00
parent 29779f5658
commit 5e5fb5912c
2 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/SystemUI/src/com/android/systemui/privacy/PrivacyItemController.kt
View File

@@ -88,9 +88,9 @@ class PrivacyItemController @Inject constructor(
ALL_INDICATORS, DEFAULT_ALL_INDICATORS)
}
// TODO(b/168209929) Remove hardcode
private fun isMicCameraEnabled(): Boolean {
return true
return deviceConfigProxy.getBoolean(DeviceConfig.NAMESPACE_PRIVACY,
MIC_CAMERA, DEFAULT_MIC_CAMERA)
}
private fun isLocationEnabled(): Boolean {
@@ -140,11 +140,12 @@ class PrivacyItemController @Inject constructor(
DEFAULT_ALL_INDICATORS)
callbacks.forEach { it.get()?.onFlagAllChanged(allIndicatorsAvailable) }
}
// TODO(b/168209929) Uncomment
// if (properties.keyset.contains(MIC_CAMERA)) {
// micCameraAvailable = properties.getBoolean(MIC_CAMERA, DEFAULT_MIC_CAMERA)
// callbacks.forEach { it.get()?.onFlagMicCameraChanged(micCameraAvailable) }
// }
if (properties.keyset.contains(MIC_CAMERA)) {
micCameraAvailable = properties.getBoolean(MIC_CAMERA, DEFAULT_MIC_CAMERA)
callbacks.forEach { it.get()?.onFlagMicCameraChanged(micCameraAvailable) }
}
if (properties.keyset.contains(LOCATION)) {
locationAvailable = properties.getBoolean(LOCATION, DEFAULT_LOCATION)
callbacks.forEach { it.get()?.onFlagLocationChanged(locationAvailable) }

8
packages/SystemUI/tests/src/com/android/systemui/privacy/PrivacyItemControllerFlagsTest.kt
View File

@@ -32,7 +32,6 @@ import com.android.systemui.util.time.FakeSystemClock
import org.junit.Assert.assertFalse
import org.junit.Assert.assertTrue
import org.junit.Before
import org.junit.Ignore
import org.junit.Test
import org.junit.runner.RunWith
import org.mockito.ArgumentCaptor
@@ -107,7 +106,6 @@ class PrivacyItemControllerFlagsTest : SysuiTestCase() {
}
@Test
@Ignore // TODO(b/168209929)
fun testMicCameraChanged() {
changeMicCamera(false) // default is true
executor.runAllReady()
@@ -140,7 +138,6 @@ class PrivacyItemControllerFlagsTest : SysuiTestCase() {
}
@Test
@Ignore // TODO(b/168209929)
fun testBothChanged() {
changeAll(true)
changeMicCamera(false)
@@ -162,7 +159,6 @@ class PrivacyItemControllerFlagsTest : SysuiTestCase() {
}
@Test
@Ignore // TODO(b/168209929)
fun testMicCamera_listening() {
changeMicCamera(true)
executor.runAllReady()
@@ -179,7 +175,6 @@ class PrivacyItemControllerFlagsTest : SysuiTestCase() {
}
@Test
@Ignore // TODO(b/168209929)
fun testAllFalse_notListening() {
changeAll(true)
executor.runAllReady()
@@ -191,7 +186,6 @@ class PrivacyItemControllerFlagsTest : SysuiTestCase() {
}
@Test
@Ignore // TODO(b/168209929)
fun testSomeListening_stillListening() {
// Mic and camera are true by default
changeAll(true)
@@ -203,7 +197,6 @@ class PrivacyItemControllerFlagsTest : SysuiTestCase() {
}
@Test
@Ignore // TODO(b/168209929)
fun testAllDeleted_micCameraFalse_stopListening() {
changeMicCamera(false)
changeAll(true)
@@ -215,7 +208,6 @@ class PrivacyItemControllerFlagsTest : SysuiTestCase() {
}
@Test
@Ignore // TODO(b/168209929)
fun testMicDeleted_stillListening() {
changeMicCamera(true)
executor.runAllReady()