Commit Graph

10902 Commits

Author SHA1 Message Date
TreeHugger Robot
cfcc352af6 Merge "Set face unlock toggle to unchecked when disabled by admin" into rvc-dev am: a2d56af9bd am: ea63b90c3d am: 4b997ee9fd am: 599f02eab1
Change-Id: I9349594dd1e6e65c441f45563b7add8453ae5aea
2020-03-31 05:03:23 +00:00
TreeHugger Robot
bc1687c94f Merge "Don't filter demoted conversation from app subtext" into rvc-dev am: 6f837d10bf am: f61da397fd am: 8b94c0e4a3 am: 1b29a5a2ba
Change-Id: Ia90ec22e76476867615f4482e27c55434e50bb10
2020-03-31 05:01:12 +00:00
Julia Reynolds
139f0ccf07 Merge "Conversations can't individually bypass dnd" into rvc-dev am: b3f2c0d528 am: 6d30804cec am: 639b6f89ea am: 41874f9f73
Change-Id: Ic0b0645779a3ca80c841b83c21f2f93cc2bdf5c5
2020-03-31 05:00:16 +00:00
TreeHugger Robot
4b997ee9fd Merge "Set face unlock toggle to unchecked when disabled by admin" into rvc-dev am: a2d56af9bd am: ea63b90c3d
Change-Id: Icbbe2f70adac63bf922dd66edb31760ae3efb851
2020-03-30 21:49:07 +00:00
TreeHugger Robot
a2d56af9bd Merge "Set face unlock toggle to unchecked when disabled by admin" into rvc-dev 2020-03-30 21:07:15 +00:00
TreeHugger Robot
8b94c0e4a3 Merge "Don't filter demoted conversation from app subtext" into rvc-dev am: 6f837d10bf am: f61da397fd
Change-Id: Ia96c24f21d404c3d043047aa68bc465f779a1114
2020-03-30 20:39:04 +00:00
Julia Reynolds
639b6f89ea Merge "Conversations can't individually bypass dnd" into rvc-dev am: b3f2c0d528 am: 6d30804cec
Change-Id: I2ea539acf7f6427021016d7fe6d102e869cce456
2020-03-30 20:38:54 +00:00
TreeHugger Robot
6f837d10bf Merge "Don't filter demoted conversation from app subtext" into rvc-dev 2020-03-30 20:03:45 +00:00
Julia Reynolds
b3f2c0d528 Merge "Conversations can't individually bypass dnd" into rvc-dev 2020-03-30 19:57:48 +00:00
Yanting Yang
7cfc3a4212 Merge "Add custom site map pairs into SettingsSearchIndexablesProvider" into rvc-dev am: ad4405d0f8 am: d8f14f11b0 am: 6b42c0780e am: c3716819c6 am: 126b9e9a44
Change-Id: I61ab316ad024e9fe8b143e24f6e5ea24ae85418b
2020-03-30 19:04:41 +00:00
Bonian Chen
a326e2ebf7 [Settings] Replace ImsManager#isVtEnabledByPlatform() am: fb7274a308 am: a6d6285b57 am: 4b42ba7807 am: f667a40821 am: 1de29efee7
Change-Id: I29cc7573f5082a777e7091e5eaf38f2ea77362b2
2020-03-30 19:01:22 +00:00
tim peng
486d40c058 Merge "PendingIntent in MediaOutputIndicatorSlice could be Hijacked" into rvc-dev am: ecea133904 am: 15ac2b2c8e am: 0f89b27f0b am: 2f01748123 am: d609a20248
Change-Id: I3c352f9594780c78fed46b23824b951ab33977ef
2020-03-30 19:01:05 +00:00
Bonian Chen
81ba423323 [Settings] Replace ImsManager#isWfcEnabledByPlatform() am: c134ef08d4 am: 9c4d1190d9 am: 712c3aa944 am: 7fe5ab1aea am: 65697d3d0e
Change-Id: I0d5dcfc33b0bddacf059d1fb9af559646e32e68a
2020-03-30 19:00:47 +00:00
tim peng
c78d096058 Merge "Add zero state in output switcher" into rvc-dev am: ddd8a8fa92 am: 3e73d0f92c am: d5bdc55390 am: 18d42df80b am: 15e38e66ac
Change-Id: I51152fb023e63d1ad795d095e26434cb35cacee4
2020-03-30 19:00:24 +00:00
Yanting Yang
0c23dcd4ec Merge "Add custom site map pairs into SettingsSearchIndexablesProvider" into rvc-dev am: ad4405d0f8 am: d8f14f11b0
Change-Id: Ia557b480b9519b0da3e84044c989072a4c90e47c
2020-03-30 18:51:51 +00:00
Bonian Chen
3205731765 [Settings] Replace ImsManager#isVtEnabledByPlatform() am: fb7274a308 am: a6d6285b57
Change-Id: Iceb405d58331badd6ec62913287a5aa1f175bf15
2020-03-30 18:31:02 +00:00
tim peng
5201d1d163 Merge "PendingIntent in MediaOutputIndicatorSlice could be Hijacked" into rvc-dev am: ecea133904 am: 15ac2b2c8e
Change-Id: I4da802d1ee9f3a994c42bf0392cd40bb1b23f319
2020-03-30 18:30:27 +00:00
Bonian Chen
ea44a49cfd [Settings] Replace ImsManager#isWfcEnabledByPlatform() am: c134ef08d4 am: 9c4d1190d9
Change-Id: Icf336c69791952c542c4c31d02a1da901e4db70e
2020-03-30 18:28:46 +00:00
tim peng
49480d1f53 Merge "Add zero state in output switcher" into rvc-dev am: ddd8a8fa92 am: 3e73d0f92c
Change-Id: Ib8b6ff0cd9dfc4ae2fdfd535354fcdd3fac5e261
2020-03-30 18:27:22 +00:00
Yanting Yang
126b9e9a44 Merge "Add custom site map pairs into SettingsSearchIndexablesProvider" into rvc-dev am: ad4405d0f8 am: d8f14f11b0 am: 6b42c0780e am: c3716819c6
Change-Id: I6e22d1d64b955285c4ae422332d3a72736feca06
2020-03-30 18:12:43 +00:00
Bonian Chen
1de29efee7 [Settings] Replace ImsManager#isVtEnabledByPlatform() am: fb7274a308 am: a6d6285b57 am: 4b42ba7807 am: f667a40821
Change-Id: I99be698447e10ff7b238d4b16f3c164fa30a3fa1
2020-03-30 18:09:33 +00:00
tim peng
d609a20248 Merge "PendingIntent in MediaOutputIndicatorSlice could be Hijacked" into rvc-dev am: ecea133904 am: 15ac2b2c8e am: 0f89b27f0b am: 2f01748123
Change-Id: Ic84c4d576c62b75c0c7aa5425f92fc32d16c4d85
2020-03-30 18:09:09 +00:00
Bonian Chen
65697d3d0e [Settings] Replace ImsManager#isWfcEnabledByPlatform() am: c134ef08d4 am: 9c4d1190d9 am: 712c3aa944 am: 7fe5ab1aea
Change-Id: I445970fbc7232aa5703b9117aaf9801b12611113
2020-03-30 18:08:51 +00:00
tim peng
15e38e66ac Merge "Add zero state in output switcher" into rvc-dev am: ddd8a8fa92 am: 3e73d0f92c am: d5bdc55390 am: 18d42df80b
Change-Id: Ibc58e2b8ada042754503d4b336dbcb5bb14c2395
2020-03-30 18:08:25 +00:00
Beverly
ef2c91c9a3 Don't filter demoted conversation from app subtext
If the notification channel is a demoted converation, we still want to
include it as a notification channel that can bypass DND under the
"apps" preference for DND.

Test: manual, make RunSettingsRoboTests7
Fixes: 152765113
Change-Id: Ief072b19280b0dc6e6c37d2d46d51f045d42bb4e
2020-03-30 14:01:38 -04:00
Julia Reynolds
56d0f6b03a Conversations can't individually bypass dnd
Test: atest
Fixes: 152482973
Change-Id: I19432b79724beca46974c1c88d42a231f0703dc7
2020-03-30 13:18:38 -04:00
Yanting Yang
ad4405d0f8 Merge "Add custom site map pairs into SettingsSearchIndexablesProvider" into rvc-dev 2020-03-30 15:15:06 +00:00
Rubin Xu
fbfba7a078 Set face unlock toggle to unchecked when disabled by admin
Bug: 135747161
Test: make RunSettingsRoboTests
    ROBOTEST_FILTER=FaceSettingsLockscreenBypassPreferenceControllerTest
Change-Id: I1e3d105184a14bfece972abb096eac44bd186273
2020-03-30 12:33:57 +01:00
Bonian Chen
fb7274a308 [Settings] Replace ImsManager#isVtEnabledByPlatform()
Replace ImsManager#isVtEnabledByPlatform() by
ImsMmTelManager.isSupported().

Bug:  140542283
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=VideoCallingPreferenceControllerTest

Change-Id: Ife5100ef288fbad6fc818e8fbdf8192c42d495b2
2020-03-30 07:41:29 +00:00
tim peng
ecea133904 Merge "PendingIntent in MediaOutputIndicatorSlice could be Hijacked" into rvc-dev 2020-03-30 06:56:16 +00:00
Tim Peng
e4ccbbec67 PendingIntent in MediaOutputIndicatorSlice could be Hijacked
-Add setPackage() to prevent local information disclosure

Bug: 151645695
Test: make -j42 RunSettingsRoboTests
Change-Id: I74c058a381fceb85695dd76d354fb49f878f9142
2020-03-30 03:53:02 +00:00
Bonian Chen
c134ef08d4 [Settings] Replace ImsManager#isWfcEnabledByPlatform()
Replace ImsManager#isWfcEnabledByPlatform().

Bug:  140542283
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingSettingsForSubTest
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=WifiCallingSettingsTest
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingPreferenceControllerTest

Change-Id: I85907efb39aecdb3fb18cacf11ce4510b898edc4
2020-03-30 03:34:01 +00:00
tim peng
ddd8a8fa92 Merge "Add zero state in output switcher" into rvc-dev 2020-03-30 02:54:33 +00:00
Julia Reynolds
d9fe7b36d3 Merge "Fix broken test" into rvc-dev am: 5a950b763f am: 275f372a72 am: ade39e479f am: 364690d789
Change-Id: I0afef276606a4784d0d33bc09f8c133478185e66
2020-03-27 16:50:57 +00:00
Julia Reynolds
275f372a72 Merge "Fix broken test" into rvc-dev am: 5a950b763f
Change-Id: If25879aec1e877bb64b1f3e2c831c677f3b80dc9
2020-03-27 15:59:02 +00:00
TreeHugger Robot
c9d59be7f2 Merge "[Wi-Fi] Refactor WifiConnectionPreferenceController with WifiTrackerLib" into rvc-dev am: 50aeb48c56 am: 98d770345d am: a4a23c4bb8 am: c2864a8d25
Change-Id: Iecd9bdb47eb40c375fae2b6c0cf5145d7cd1525b
2020-03-27 15:54:27 +00:00
Julia Reynolds
5a950b763f Merge "Fix broken test" into rvc-dev 2020-03-27 15:40:47 +00:00
TreeHugger Robot
0821ce8e47 Merge "[Wi-Fi] Fix 3 unit tests fail in WifiMeteredPreferenceController2Test" into rvc-dev am: 5f886e7406 am: b22f48ea5d am: 0e6dbd0440 am: d86bbbacb7
Change-Id: I0daa3347a2ec6a0a704da492ebba54e9d5020b0e
2020-03-27 15:03:57 +00:00
TreeHugger Robot
98d770345d Merge "[Wi-Fi] Refactor WifiConnectionPreferenceController with WifiTrackerLib" into rvc-dev am: 50aeb48c56
Change-Id: I3e02884ec575cd33d4541a41a99403d79e79735b
2020-03-27 15:03:51 +00:00
TreeHugger Robot
50aeb48c56 Merge "[Wi-Fi] Refactor WifiConnectionPreferenceController with WifiTrackerLib" into rvc-dev 2020-03-27 14:43:57 +00:00
TreeHugger Robot
0e6dbd0440 Merge "[Wi-Fi] Fix 3 unit tests fail in WifiMeteredPreferenceController2Test" into rvc-dev am: 5f886e7406 am: b22f48ea5d
Change-Id: I251d19f45e4ea543c9c473e18de60820f827631b
2020-03-27 14:27:38 +00:00
TreeHugger Robot
ca9dad3430 Merge "[Wi-Fi] Fix 3 unit tests fail in WifiMeteredPreferenceController2Test" into rvc-dev am: 5f886e7406
Change-Id: I6259f15e62ecb2bd18e9430ae79ce7f6f455945d
2020-03-27 14:11:07 +00:00
TreeHugger Robot
5f886e7406 Merge "[Wi-Fi] Fix 3 unit tests fail in WifiMeteredPreferenceController2Test" into rvc-dev 2020-03-27 13:53:22 +00:00
TreeHugger Robot
9d0098bcc2 Merge "Add mocked main looper to test" into rvc-dev am: 493bf6697f am: 857392d25b am: 063208c56c am: 8ad2e1dd29
Change-Id: I8210b58e009bc10c82e34ecfc898c633f9aa6ea3
2020-03-27 13:52:23 +00:00
Julia Reynolds
83d0de8d07 Fix broken test
Test: this
Fixes: 152374833
Change-Id: I9065f6b3700fa288cb3fd65ef2b24c2821325e51
2020-03-27 09:36:18 -04:00
Alic Tsai
94a964df39 Merge "Device details LCR should be show up " ! " with low battery." into rvc-dev am: df8b9acc69 am: 4d7db64de0 am: d4ad3f6843 am: b2427ccab5
Change-Id: If3f2ff47dc1d4134ea0190b236f2589d316c79cf
2020-03-27 13:19:20 +00:00
TreeHugger Robot
857392d25b Merge "Add mocked main looper to test" into rvc-dev am: 493bf6697f
Change-Id: I17c24d2ab1c3344e985f0dd8427bd74b1a3d50db
2020-03-27 13:12:13 +00:00
TreeHugger Robot
493bf6697f Merge "Add mocked main looper to test" into rvc-dev 2020-03-27 13:00:21 +00:00
Alic Tsai
d4ad3f6843 Merge "Device details LCR should be show up " ! " with low battery." into rvc-dev am: df8b9acc69 am: 4d7db64de0
Change-Id: I990048d040bb1626a457ab8371d9482ee5053a68
2020-03-27 12:50:04 +00:00
Alic Tsai
019c186bb7 Merge "Device details LCR should be show up " ! " with low battery." into rvc-dev am: df8b9acc69
Change-Id: Ie74fcd532cb8ea4ed362b03f8c3b4dc54d73225c
2020-03-27 12:35:19 +00:00