Automerger Merge Worker
22a8cba196
Merge "Merge "Increase the timeout for contextual card loading." into rvc-dev am: c3b262ed52 am: 7a89d57820" into rvc-d1-dev-plus-aosp
2020-05-28 16:00:49 +00:00
TreeHugger Robot
704823b2d4
Merge "Increase the timeout for contextual card loading." into rvc-dev am: c3b262ed52 am: 7a89d57820
...
Change-Id: I3165cb7a5851841685370af19694e41f2a2243b8
2020-05-28 16:00:45 +00:00
TreeHugger Robot
a498b95ddb
Merge "Increase the timeout for contextual card loading." into rvc-dev am: c3b262ed52 am: 1d1e16a09b
...
Change-Id: I953515152c0e9d7a7bf3bc726a83d29e21841f5b
2020-05-28 16:00:44 +00:00
TreeHugger Robot
7a71c443d3
Merge "Increase the timeout for contextual card loading." into rvc-dev am: c3b262ed52 am: 1d1e16a09b
...
Change-Id: I05739c26296ff53f1c218e0dd0070e10f641e960
2020-05-28 16:00:38 +00:00
Jay Aliomer
57cc7d01ae
Incorrect localization of dark theme custom time
...
Fixes: 154361883
Test: manually select dark theme custom time and make sure it matches
locale
Change-Id: I2a918b4b2f5aad6b04d3b0318bbca25e82dfae78
2020-05-28 12:00:17 -04:00
Bonian Chen
41747f7108
Merge "[Settings] Avoid crash for VoIP account displayed as default voice" into rvc-dev am: e2da25108a am: cb1353756d am: 06312e5db5 am: d8a4346764 am: 3a33b018d5
...
Change-Id: I96fc5a009afc5d3a6132763bbaedfb7b4af58c9d
2020-05-28 15:52:17 +00:00
Bonian Chen
14e82883c4
Merge "[Settings] Avoid crash for VoIP account displayed as default voice" into rvc-dev am: e2da25108a am: 42ba4a5fc7 am: fd2b4d8c32 am: 914ba05d04 am: 0c855c519b
...
Change-Id: I732553aae39ce9f626d70c389457e25a678bacd8
2020-05-28 15:52:10 +00:00
Bonian Chen
6f38269674
Merge "[Settings] Avoid crash for VoIP account displayed as default voice" into rvc-dev am: e2da25108a am: cb1353756d am: 8367dc4e03 am: f2bb69f354 am: e837495c6c
...
Change-Id: I42cef6627e3d3f8082b1b2db85975fbab6c026e2
2020-05-28 15:52:03 +00:00
TreeHugger Robot
a8ebfe9e00
Merge "Revert "Do not prebind sticky slices."" into rvc-dev am: 591d761d43
...
Change-Id: I153a235418d5089dff46d1f3cbc8b9e0989a2046
2020-05-28 15:48:18 +00:00
TreeHugger Robot
1438ab4d59
Merge "Revert "Do not prebind sticky slices."" into rvc-dev am: 591d761d43
...
Change-Id: I6fca5b77f9301f2ddf0336beb8f12dd8bfd9bcb6
2020-05-28 15:48:00 +00:00
TreeHugger Robot
7a89d57820
Merge "Increase the timeout for contextual card loading." into rvc-dev am: c3b262ed52
...
Change-Id: I5f379ae4e52fcdbdeef33f995a4f7179846ca936
2020-05-28 15:47:52 +00:00
TreeHugger Robot
1d1e16a09b
Merge "Increase the timeout for contextual card loading." into rvc-dev am: c3b262ed52
...
Change-Id: I50b31cbe7f309b988d30d5cab191dc6be9095eef
2020-05-28 15:47:30 +00:00
Bonian Chen
3a33b018d5
Merge "[Settings] Avoid crash for VoIP account displayed as default voice" into rvc-dev am: e2da25108a am: cb1353756d am: 06312e5db5 am: d8a4346764
...
Change-Id: I69bbd5fea20fc39c366efc9179aacec5424e359d
2020-05-28 15:45:24 +00:00
Bonian Chen
0c855c519b
Merge "[Settings] Avoid crash for VoIP account displayed as default voice" into rvc-dev am: e2da25108a am: 42ba4a5fc7 am: fd2b4d8c32 am: 914ba05d04
...
Change-Id: I61b4d06181917db7257e3ba43d3d2bd25e6e663b
2020-05-28 15:45:01 +00:00
Bonian Chen
e837495c6c
Merge "[Settings] Avoid crash for VoIP account displayed as default voice" into rvc-dev am: e2da25108a am: cb1353756d am: 8367dc4e03 am: f2bb69f354
...
Change-Id: I059fcd2231c9d4b65f1c6e2eaf74d1c9e7391193
2020-05-28 15:43:26 +00:00
TreeHugger Robot
591d761d43
Merge "Revert "Do not prebind sticky slices."" into rvc-dev
2020-05-28 15:42:28 +00:00
Yi-Ling Chuang
740db33c5c
Revert "Do not prebind sticky slices."
...
This reverts commit ac59ea8e23
2020-05-28 15:42:15 +00:00
TreeHugger Robot
c3b262ed52
Merge "Increase the timeout for contextual card loading." into rvc-dev
2020-05-28 15:37:37 +00:00
Bonian Chen
d8a4346764
Merge "[Settings] Avoid crash for VoIP account displayed as default voice" into rvc-dev am: e2da25108a am: cb1353756d am: 06312e5db5
...
Change-Id: Ie4ee52bbf8a2b53ce70779f7bc8d23476ee3e20c
2020-05-28 15:29:39 +00:00
Bonian Chen
914ba05d04
Merge "[Settings] Avoid crash for VoIP account displayed as default voice" into rvc-dev am: e2da25108a am: 42ba4a5fc7 am: fd2b4d8c32
...
Change-Id: Id18f9c6462c5d500e933a48e6f22b0cc5bf7f3c5
2020-05-28 15:29:31 +00:00
Bonian Chen
f2bb69f354
Merge "[Settings] Avoid crash for VoIP account displayed as default voice" into rvc-dev am: e2da25108a am: cb1353756d am: 8367dc4e03
...
Change-Id: I2bf3f6f320168dc1031299e084dbf79507a5a4f0
2020-05-28 15:29:17 +00:00
Automerger Merge Worker
93f5666e88
Merge "EnabledNetworkModePreferenceController Remove AllowedNetworkType am: 259e6288c9 am: 6425a5e7c9" into rvc-d1-dev-plus-aosp am: 666b90393f am: 35db8bade4 am: 36f2bb83fc
...
Change-Id: Id30a6b9ae1a85a90ef59f69c1f50b6be0ed92836
2020-05-28 15:22:33 +00:00
Automerger Merge Worker
3eab7c3b26
Merge "EnabledNetworkModePreferenceController Remove AllowedNetworkType am: 259e6288c9 am: b6b8bc01e8 am: 24c4c990ef" into rvc-qpr-dev-plus-aosp am: 8351265a91 am: e6779dd9aa
...
Change-Id: I12b77f3de3885ea71119bde9af18ee350d6558c4
2020-05-28 15:22:17 +00:00
Bonian Chen
fd2b4d8c32
Merge "[Settings] Avoid crash for VoIP account displayed as default voice" into rvc-dev am: e2da25108a am: 42ba4a5fc7
...
Change-Id: I83ddb21ebd72872ecd23f5fd5c13b691a8529c96
2020-05-28 15:18:32 +00:00
SongFerngWang
373f58fced
EnabledNetworkModePreferenceController Remove AllowedNetworkType am: 259e6288c9 am: b6b8bc01e8 am: b086e67289 am: cc361e10ae am: 480b56b3f3
...
Change-Id: If98bccada42e8e94e8349a8617c094f685af67f0
2020-05-28 15:18:16 +00:00
Bonian Chen
8367dc4e03
Merge "[Settings] Avoid crash for VoIP account displayed as default voice" into rvc-dev am: e2da25108a am: cb1353756d
...
Change-Id: I42f4408e3030de899931be97cf9561797ccab725
2020-05-28 15:18:14 +00:00
Bonian Chen
06312e5db5
Merge "[Settings] Avoid crash for VoIP account displayed as default voice" into rvc-dev am: e2da25108a am: cb1353756d
...
Change-Id: I86f0150ef7eb6f8f4666f749897f47ffff5333cf
2020-05-28 15:18:10 +00:00
Automerger Merge Worker
36f2bb83fc
Merge "EnabledNetworkModePreferenceController Remove AllowedNetworkType am: 259e6288c9 am: 6425a5e7c9" into rvc-d1-dev-plus-aosp am: 666b90393f am: 35db8bade4
...
Change-Id: Id25ef0089e71ae19dd3206ce6b3f09b3862cea6d
2020-05-28 15:07:53 +00:00
Bonian Chen
cb1353756d
Merge "[Settings] Avoid crash for VoIP account displayed as default voice" into rvc-dev am: e2da25108a
...
Change-Id: I98bea7d8fa90e267a3039012bf19babd2eec7223
2020-05-28 15:07:52 +00:00
Bonian Chen
42ba4a5fc7
Merge "[Settings] Avoid crash for VoIP account displayed as default voice" into rvc-dev am: e2da25108a
...
Change-Id: I7ba14ae944d40e74038c3bdf8dd0a6cf44e5326b
2020-05-28 15:07:46 +00:00
Automerger Merge Worker
e6779dd9aa
Merge "EnabledNetworkModePreferenceController Remove AllowedNetworkType am: 259e6288c9 am: b6b8bc01e8 am: 24c4c990ef" into rvc-qpr-dev-plus-aosp am: 8351265a91
...
Change-Id: I0f5eb896e73376828403b965f73c8966aa7ba363
2020-05-28 15:07:46 +00:00
SongFerngWang
480b56b3f3
EnabledNetworkModePreferenceController Remove AllowedNetworkType am: 259e6288c9 am: b6b8bc01e8 am: b086e67289 am: cc361e10ae
...
Change-Id: Icdceccc1028c3a050189a95a474f83fe123fceed
2020-05-28 15:07:37 +00:00
Bonian Chen
e2da25108a
Merge "[Settings] Avoid crash for VoIP account displayed as default voice" into rvc-dev
2020-05-28 14:59:47 +00:00
Automerger Merge Worker
35db8bade4
Merge "EnabledNetworkModePreferenceController Remove AllowedNetworkType am: 259e6288c9 am: 6425a5e7c9" into rvc-d1-dev-plus-aosp am: 666b90393f
...
Change-Id: I0e9efd8725ea8df11e63880602e04c086fb80831
2020-05-28 14:58:15 +00:00
Automerger Merge Worker
8351265a91
Merge "EnabledNetworkModePreferenceController Remove AllowedNetworkType am: 259e6288c9 am: b6b8bc01e8 am: 24c4c990ef" into rvc-qpr-dev-plus-aosp
2020-05-28 14:57:42 +00:00
SongFerngWang
c75635df7c
EnabledNetworkModePreferenceController Remove AllowedNetworkType am: 259e6288c9 am: b6b8bc01e8 am: 24c4c990ef
...
Change-Id: I9667686c25d349502f76a469e74a7bc338ce4ba0
2020-05-28 14:57:38 +00:00
SongFerngWang
cc361e10ae
EnabledNetworkModePreferenceController Remove AllowedNetworkType am: 259e6288c9 am: b6b8bc01e8 am: b086e67289
...
Change-Id: Iabf8c9a6293ba4c92de7c958f7674ea53ed5be39
2020-05-28 14:57:28 +00:00
Automerger Merge Worker
666b90393f
Merge "EnabledNetworkModePreferenceController Remove AllowedNetworkType am: 259e6288c9 am: 6425a5e7c9" into rvc-d1-dev-plus-aosp
2020-05-28 14:47:24 +00:00
SongFerngWang
04fe2247de
EnabledNetworkModePreferenceController Remove AllowedNetworkType am: 259e6288c9 am: 6425a5e7c9
...
Change-Id: I55af5af7a75e99f66fa2106398d8a66da91a9afc
2020-05-28 14:47:18 +00:00
SongFerngWang
b086e67289
EnabledNetworkModePreferenceController Remove AllowedNetworkType am: 259e6288c9 am: b6b8bc01e8
...
Change-Id: Ic87925e1939f53d5428007a613138155ac57eeb2
2020-05-28 14:47:13 +00:00
SongFerngWang
24c4c990ef
EnabledNetworkModePreferenceController Remove AllowedNetworkType am: 259e6288c9 am: b6b8bc01e8
...
Change-Id: I31d1fc85b15e7b3d4335380ca4dbe6ef1e856e57
2020-05-28 14:47:12 +00:00
SongFerngWang
b6b8bc01e8
EnabledNetworkModePreferenceController Remove AllowedNetworkType am: 259e6288c9
...
Change-Id: I4064e14c9ed83f5712141ebff4edc8217efd879b
2020-05-28 14:32:40 +00:00
SongFerngWang
6425a5e7c9
EnabledNetworkModePreferenceController Remove AllowedNetworkType am: 259e6288c9
...
Change-Id: I9a5fc5bc6ef5e04a8fad91051cc3aacbe9c7261f
2020-05-28 14:32:35 +00:00
SongFerngWang
259e6288c9
EnabledNetworkModePreferenceController Remove AllowedNetworkType
...
Power manager decision do enable/disable NR by AllowedNetworkType,
and it will effect the PreferredNetworkMode UI. The
PreferredNetworkMode list no 5G item when AllowedNetworkType
disabled.
Bug: 156709797
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
EnabledNetworkModePreferenceControllerTest (pass)
Change-Id: I3ab9eca0956c4cce1b79e518942063b681eb96cd
2020-05-28 20:37:51 +08:00
Automerger Merge Worker
6c0bd3f9f0
Merge "Merge "Send metrics log of card dismiss event to SI instantly" into rvc-dev am: f5056a03e3 am: 44b9dfb558 am: e0ea0ace85" into rvc-qpr-dev-plus-aosp am: 067c2bc9cc am: 8396210ed6
...
Change-Id: If892d11c6ca6a6e6e3a69f053b252651e466010f
2020-05-28 12:24:46 +00:00
TreeHugger Robot
39dbf96185
Merge "Send metrics log of card dismiss event to SI instantly" into rvc-dev am: f5056a03e3 am: db19d8ffd0 am: 4d64c02c02 am: 1c7ae21c92 am: 61c463a612
...
Change-Id: Id721b9977a2611079e38b05622b33db0ed690460
2020-05-28 12:24:39 +00:00
TreeHugger Robot
f99f250d0f
Merge "Send metrics log of card dismiss event to SI instantly" into rvc-dev am: f5056a03e3 am: db19d8ffd0 am: 36d8289420 am: f31dedc48b am: 69584b6483
...
Change-Id: Ida4d0086efdff94b1fc70cedfdcc40bbe3d4a4c5
2020-05-28 12:24:13 +00:00
Tsung-Mao Fang
850bafbf58
Disable anomaly app detection for battery
...
This feature is introducing some false positive cases,
so we're going to disable this feature now.
Battery team will make it more precise in the next release.
Test: Run robotest. See there's no related card in battery page.
Fix: 156369998
Change-Id: I2dfe2f772e561b768af6af45ac92fdc65c1fafee
2020-05-28 20:14:32 +08:00
Automerger Merge Worker
8396210ed6
Merge "Merge "Send metrics log of card dismiss event to SI instantly" into rvc-dev am: f5056a03e3 am: 44b9dfb558 am: e0ea0ace85" into rvc-qpr-dev-plus-aosp am: 067c2bc9cc
...
Change-Id: I14547893a5104a389c2ecb0c6c959ded4415d663
2020-05-28 12:10:30 +00:00
TreeHugger Robot
61c463a612
Merge "Send metrics log of card dismiss event to SI instantly" into rvc-dev am: f5056a03e3 am: db19d8ffd0 am: 4d64c02c02 am: 1c7ae21c92
...
Change-Id: I1df9b3b9b05aaaf8edb0353e146cfb0929430b21
2020-05-28 12:10:19 +00:00
