From 1a280b0979233ca9ad87bf055cda5dc76a3679eb Mon Sep 17 00:00:00 2001 From: Daniel Roschka Date: Sun, 15 Mar 2020 14:27:39 +0100 Subject: [PATCH] Remove redundant config_dozeComponent property The `config_dozeComponent` property is already [set via device_phh_treble][1] and all overlays overwriting it just did so with its default value. As this doesn't add any value, this commit removes the definition of `config_dozeComponent` from all overlays which set it. It also removes `config_dozeComponent` from `knownKeys` with the intention that somebody wanting to overwrite it in future should justify why it should get added back to `knownKeys` again. [1]: https://github.com/phhusson/device_phh_treble/blob/04583fa95a6c58d25dda7644002f9da05eee3ab2/overlay/frameworks/base/core/res/res/values/config.xml#L32 --- Huawei/hi3660/DUK/res/values/config.xml | 10 ---------- Huawei/hi3660/STF/res/values/config.xml | 10 ---------- Huawei/hi3660/VTR/res/values/config.xml | 10 ---------- Huawei/hi6250/ANE/res/values/config.xml | 10 ---------- Huawei/hi6250/BND/res/values/config.xml | 10 ---------- Huawei/hi6250/LLD/res/values/config.xml | 10 ---------- Huawei/hi6250/PRA/res/values/config.xml | 10 ---------- Huawei/hi6250/RNE/res/values/config.xml | 10 ---------- Huawei/hi6250/WAS/res/values/config.xml | 10 ---------- Huawei/msm8917/ATU/res/values/config.xml | 10 ---------- LG/G7/res/values/config.xml | 1 - Moto/E5/res/values/config.xml | 3 +-- Moto/E5Plus/res/values/config.xml | 1 - Moto/G6/res/values/config.xml | 1 - Moto/G6Play/res/values/config.xml | 1 - Moto/G6Plus/res/values/config.xml | 1 - Moto/G7Play/res/values/config.xml | 1 - Moto/G7Power/res/values/config.xml | 1 - Nubia/Z18mini/res/values/config.xml | 1 - OnePlus/OP6/res/values/config.xml | 3 +-- Samsung/S10e/res/values/doze.xml | 1 - Xiaomi/MiMix3/res/values/config.xml | 1 - Xiaomi/RedmiGo/res/values/config.xml | 9 --------- tests/knownKeys | 1 - 24 files changed, 2 insertions(+), 124 deletions(-) diff --git a/Huawei/hi3660/DUK/res/values/config.xml b/Huawei/hi3660/DUK/res/values/config.xml index 225fb4b..2a6656b 100644 --- a/Huawei/hi3660/DUK/res/values/config.xml +++ b/Huawei/hi3660/DUK/res/values/config.xml @@ -83,16 +83,6 @@ true - - - com.android.systemui/com.android.systemui.doze.DozeService diff --git a/Huawei/hi3660/STF/res/values/config.xml b/Huawei/hi3660/STF/res/values/config.xml index 4d18c87..04dcc26 100644 --- a/Huawei/hi3660/STF/res/values/config.xml +++ b/Huawei/hi3660/STF/res/values/config.xml @@ -83,16 +83,6 @@ true - - - com.android.systemui/com.android.systemui.doze.DozeService diff --git a/Huawei/hi3660/VTR/res/values/config.xml b/Huawei/hi3660/VTR/res/values/config.xml index 4d18c87..04dcc26 100644 --- a/Huawei/hi3660/VTR/res/values/config.xml +++ b/Huawei/hi3660/VTR/res/values/config.xml @@ -83,16 +83,6 @@ true - - - com.android.systemui/com.android.systemui.doze.DozeService diff --git a/Huawei/hi6250/ANE/res/values/config.xml b/Huawei/hi6250/ANE/res/values/config.xml index 4d18c87..04dcc26 100644 --- a/Huawei/hi6250/ANE/res/values/config.xml +++ b/Huawei/hi6250/ANE/res/values/config.xml @@ -83,16 +83,6 @@ true - - - com.android.systemui/com.android.systemui.doze.DozeService diff --git a/Huawei/hi6250/BND/res/values/config.xml b/Huawei/hi6250/BND/res/values/config.xml index 4d18c87..04dcc26 100644 --- a/Huawei/hi6250/BND/res/values/config.xml +++ b/Huawei/hi6250/BND/res/values/config.xml @@ -83,16 +83,6 @@ true - - - com.android.systemui/com.android.systemui.doze.DozeService diff --git a/Huawei/hi6250/LLD/res/values/config.xml b/Huawei/hi6250/LLD/res/values/config.xml index 4d18c87..04dcc26 100644 --- a/Huawei/hi6250/LLD/res/values/config.xml +++ b/Huawei/hi6250/LLD/res/values/config.xml @@ -83,16 +83,6 @@ true - - - com.android.systemui/com.android.systemui.doze.DozeService diff --git a/Huawei/hi6250/PRA/res/values/config.xml b/Huawei/hi6250/PRA/res/values/config.xml index cc53003..629e2b9 100644 --- a/Huawei/hi6250/PRA/res/values/config.xml +++ b/Huawei/hi6250/PRA/res/values/config.xml @@ -83,16 +83,6 @@ true - - - com.android.systemui/com.android.systemui.doze.DozeService diff --git a/Huawei/hi6250/RNE/res/values/config.xml b/Huawei/hi6250/RNE/res/values/config.xml index cc53003..629e2b9 100644 --- a/Huawei/hi6250/RNE/res/values/config.xml +++ b/Huawei/hi6250/RNE/res/values/config.xml @@ -83,16 +83,6 @@ true - - - com.android.systemui/com.android.systemui.doze.DozeService diff --git a/Huawei/hi6250/WAS/res/values/config.xml b/Huawei/hi6250/WAS/res/values/config.xml index cc53003..629e2b9 100644 --- a/Huawei/hi6250/WAS/res/values/config.xml +++ b/Huawei/hi6250/WAS/res/values/config.xml @@ -83,16 +83,6 @@ true - - - com.android.systemui/com.android.systemui.doze.DozeService diff --git a/Huawei/msm8917/ATU/res/values/config.xml b/Huawei/msm8917/ATU/res/values/config.xml index a228af1..44c760e 100644 --- a/Huawei/msm8917/ATU/res/values/config.xml +++ b/Huawei/msm8917/ATU/res/values/config.xml @@ -105,16 +105,6 @@ true - - com.android.systemui/com.android.systemui.doze.DozeService - true diff --git a/LG/G7/res/values/config.xml b/LG/G7/res/values/config.xml index 98ef80a..815ef82 100644 --- a/LG/G7/res/values/config.xml +++ b/LG/G7/res/values/config.xml @@ -79,7 +79,6 @@ false true - com.android.systemui/com.android.systemui.doze.DozeService true true diff --git a/Moto/E5/res/values/config.xml b/Moto/E5/res/values/config.xml index 90d0f2f..17f85b2 100644 --- a/Moto/E5/res/values/config.xml +++ b/Moto/E5/res/values/config.xml @@ -76,7 +76,6 @@ true true - com.android.systemui/com.android.systemui.doze.DozeService true true true @@ -118,4 +117,4 @@ /system/framework/arm/boot-core-libart.oat /system/framework/arm/boot-core-libart.vdex - \ No newline at end of file + diff --git a/Moto/E5Plus/res/values/config.xml b/Moto/E5Plus/res/values/config.xml index 146c39b..e05c4a3 100644 --- a/Moto/E5Plus/res/values/config.xml +++ b/Moto/E5Plus/res/values/config.xml @@ -77,7 +77,6 @@ true true - com.android.systemui/com.android.systemui.doze.DozeService true true true diff --git a/Moto/G6/res/values/config.xml b/Moto/G6/res/values/config.xml index 38a03a2..021cb70 100644 --- a/Moto/G6/res/values/config.xml +++ b/Moto/G6/res/values/config.xml @@ -76,7 +76,6 @@ true true - com.android.systemui/com.android.systemui.doze.DozeService true true true diff --git a/Moto/G6Play/res/values/config.xml b/Moto/G6Play/res/values/config.xml index a806fe9..d52ae26 100644 --- a/Moto/G6Play/res/values/config.xml +++ b/Moto/G6Play/res/values/config.xml @@ -76,7 +76,6 @@ true true - com.android.systemui/com.android.systemui.doze.DozeService true true true diff --git a/Moto/G6Plus/res/values/config.xml b/Moto/G6Plus/res/values/config.xml index 8ca34b7..a2f06ee 100644 --- a/Moto/G6Plus/res/values/config.xml +++ b/Moto/G6Plus/res/values/config.xml @@ -77,7 +77,6 @@ true true - com.android.systemui/com.android.systemui.doze.DozeService true true true diff --git a/Moto/G7Play/res/values/config.xml b/Moto/G7Play/res/values/config.xml index 740b614..754192f 100644 --- a/Moto/G7Play/res/values/config.xml +++ b/Moto/G7Play/res/values/config.xml @@ -89,7 +89,6 @@ 26 com.motorola.sensor.camera_activate - com.android.systemui/com.android.systemui.doze.DozeService org.codeaurora.ims M -188,0 L -188,72 L 188,72 L 188,0 Z diff --git a/Moto/G7Power/res/values/config.xml b/Moto/G7Power/res/values/config.xml index d503807..140c4de 100644 --- a/Moto/G7Power/res/values/config.xml +++ b/Moto/G7Power/res/values/config.xml @@ -66,7 +66,6 @@ true true - com.android.systemui/com.android.systemui.doze.DozeService true true true diff --git a/Nubia/Z18mini/res/values/config.xml b/Nubia/Z18mini/res/values/config.xml index e8603ee..c75ef2e 100644 --- a/Nubia/Z18mini/res/values/config.xml +++ b/Nubia/Z18mini/res/values/config.xml @@ -57,7 +57,6 @@ 680 true - com.android.systemui/com.android.systemui.doze.DozeService true true diff --git a/OnePlus/OP6/res/values/config.xml b/OnePlus/OP6/res/values/config.xml index e8b9ad7..9d99945 100644 --- a/OnePlus/OP6/res/values/config.xml +++ b/OnePlus/OP6/res/values/config.xml @@ -64,7 +64,6 @@ true true - diff --git a/Samsung/S10e/res/values/doze.xml b/Samsung/S10e/res/values/doze.xml index e00baf1..8d49788 100644 --- a/Samsung/S10e/res/values/doze.xml +++ b/Samsung/S10e/res/values/doze.xml @@ -1,6 +1,5 @@ - com.android.systemui/com.android.systemui.doze.DozeService true true diff --git a/Xiaomi/MiMix3/res/values/config.xml b/Xiaomi/MiMix3/res/values/config.xml index 1cef869..dbbb772 100644 --- a/Xiaomi/MiMix3/res/values/config.xml +++ b/Xiaomi/MiMix3/res/values/config.xml @@ -836,7 +836,6 @@ true true - com.android.systemui/com.android.systemui.doze.DozeService false true true diff --git a/Xiaomi/RedmiGo/res/values/config.xml b/Xiaomi/RedmiGo/res/values/config.xml index 25c2a8d..3a6aa60 100644 --- a/Xiaomi/RedmiGo/res/values/config.xml +++ b/Xiaomi/RedmiGo/res/values/config.xml @@ -154,15 +154,6 @@ true 3300 - - com.android.systemui/com.android.systemui.doze.DozeService true diff --git a/tests/knownKeys b/tests/knownKeys index 17d688e..ffaff64 100644 --- a/tests/knownKeys +++ b/tests/knownKeys @@ -34,7 +34,6 @@ config_displayBlanksAfterDoze config_doublePressOnPowerBehavior config_dozeAfterScreenOffByDefault config_dozeAlwaysOnDisplayAvailable -config_dozeComponent config_dynamic_bind_ims config_enableAutoPowerModes config_enableMultiUserUI