Automerger Merge Worker
45c1e42054
Merge "Merge "Disable anomaly app detection for battery" into rvc-dev am: 90331c0f20
am: ef95b4781b" into rvc-d1-dev-plus-aosp
2020-05-29 07:15:20 +00:00
Automerger Merge Worker
eae5f7b28d
Merge "Merge "[ANR] Settings froze" into rvc-dev am: dd356c5653
am: ac6c74c146" into rvc-d1-dev-plus-aosp
2020-05-29 07:15:15 +00:00
TreeHugger Robot
c0e5e35830
Merge "Disable anomaly app detection for battery" into rvc-dev am: 90331c0f20
am: ef95b4781b
...
Change-Id: Ib7bf827f55b4b84dc07441f5251ef81b18d7334f
2020-05-29 07:15:14 +00:00
TreeHugger Robot
99eb478f1b
Merge "[ANR] Settings froze" into rvc-dev am: dd356c5653
am: ac6c74c146
...
Change-Id: If87379a630b50a80e7eda404db4813b9e80cc7f8
2020-05-29 07:15:06 +00:00
TreeHugger Robot
7392cae089
Merge "[ANR] Settings froze" into rvc-dev am: dd356c5653
am: 29e0d389bf
...
Change-Id: Ibd7a31e361f6bdb67fbf810a4129c9d42f99b3d8
2020-05-29 07:15:02 +00:00
TreeHugger Robot
ac6c74c146
Merge "[ANR] Settings froze" into rvc-dev am: dd356c5653
...
Change-Id: I06cde00fea23eb9f1aaf745de9d4f8822ffbf9dd
2020-05-29 06:50:05 +00:00
TreeHugger Robot
ef95b4781b
Merge "Disable anomaly app detection for battery" into rvc-dev am: 90331c0f20
...
Change-Id: Ie3409d93df4c63857cfdbd8bf5d5b263f4bd390c
2020-05-29 06:50:02 +00:00
TreeHugger Robot
29e0d389bf
Merge "[ANR] Settings froze" into rvc-dev am: dd356c5653
...
Change-Id: I337c660b32dcb94482919cf934b28d29ebbaa771
2020-05-29 06:49:54 +00:00
TreeHugger Robot
90331c0f20
Merge "Disable anomaly app detection for battery" into rvc-dev
2020-05-29 06:47:00 +00:00
TreeHugger Robot
dd356c5653
Merge "[ANR] Settings froze" into rvc-dev
2020-05-29 06:37:53 +00:00
Automerger Merge Worker
ebb199a374
Merge "Merge "Improve feedback when failing transferring a disconnected device" into rvc-dev am: 6febf2c629
am: 1b1e05fb1d" into rvc-d1-dev-plus-aosp
2020-05-29 05:36:14 +00:00
tim peng
8b5d909a86
Merge "Improve feedback when failing transferring a disconnected device" into rvc-dev am: 6febf2c629
am: 771ece6156
...
Change-Id: Iadb742a7328cc8b8a135c55026e19727c09e9415
2020-05-29 05:36:07 +00:00
tim peng
0292ef59a3
Merge "Improve feedback when failing transferring a disconnected device" into rvc-dev am: 6febf2c629
am: 1b1e05fb1d
...
Change-Id: I63d82781f0b548d8724495449b608fb638410b57
2020-05-29 05:36:02 +00:00
tim peng
1b1e05fb1d
Merge "Improve feedback when failing transferring a disconnected device" into rvc-dev am: 6febf2c629
...
Change-Id: I8bb341fb70c18e314ae8ac2bdfbf5ce1140845b5
2020-05-29 05:22:02 +00:00
tim peng
771ece6156
Merge "Improve feedback when failing transferring a disconnected device" into rvc-dev am: 6febf2c629
...
Change-Id: I462bcb49de448b2a1d5ac81dd75460ca08c6558c
2020-05-29 05:21:48 +00:00
tim peng
6febf2c629
Merge "Improve feedback when failing transferring a disconnected device" into rvc-dev
2020-05-29 05:09:07 +00:00
Tim Peng
0989586ce2
[ANR] Settings froze
...
-To handle getActiveLocalMediaController() in a background thread
-To update test cases for waiting LocalMediaManager initial in
background thread
Bug: 157522889
Test: make -j42 RunSettingsRoboTests
Change-Id: I27cd282a89ac9cfb6a098843f7282d5b94d98402
2020-05-29 02:30:56 +00:00
Jay Aliomer
bc1d235392
Merge "Incorrect localization of dark theme custom time" into rvc-dev am: fb6711ae92
am: 2f9e6f6ba3
...
Change-Id: I65a6524f259ae3cdbdaa9d11f8f86bcf5b065b68
2020-05-28 23:50:58 +00:00
Jay Aliomer
73a818e99f
Merge "Incorrect localization of dark theme custom time" into rvc-dev am: fb6711ae92
am: e931c35f4d
...
Change-Id: I2f3937ea0edfa14470bbf9dd4d7d147bf39cd8d6
2020-05-28 23:38:34 +00:00
TreeHugger Robot
83be1b647b
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 3304eb3fb6
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Ie33f766bfdd35e198bafed6eeaee788c21f861aa
2020-05-28 23:38:18 +00:00
Jay Aliomer
e931c35f4d
Merge "Incorrect localization of dark theme custom time" into rvc-dev am: fb6711ae92
...
Change-Id: Ibf41defa2849b26c934dd3b72d30117993d696f2
2020-05-28 23:37:48 +00:00
Jay Aliomer
2f9e6f6ba3
Merge "Incorrect localization of dark theme custom time" into rvc-dev am: fb6711ae92
...
Change-Id: I1b5f3194e8a9df86aacc359322792c0e0561f9b2
2020-05-28 23:37:07 +00:00
TreeHugger Robot
3304eb3fb6
Merge "Import translations. DO NOT MERGE" into rvc-d1-dev
2020-05-28 22:52:24 +00:00
Jay Aliomer
fb6711ae92
Merge "Incorrect localization of dark theme custom time" into rvc-dev
2020-05-28 22:21:21 +00:00
TreeHugger Robot
4bd0678f8d
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: be2190fe64
-s ours am: 171694b82e
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I0e9923c6059bb8d6a6b7b2f04c357d2ca74dcbe8
2020-05-28 20:25:29 +00:00
TreeHugger Robot
7b20181315
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: be2190fe64
-s ours am: d33f82d74d
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Ibbec16d34d5cc96164b9de16b43270566fe347f5
2020-05-28 20:25:17 +00:00
TreeHugger Robot
d33f82d74d
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: be2190fe64
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I3a54ebb46410c308d3a4bb0fbc34a328157fb8e9
2020-05-28 20:09:52 +00:00
TreeHugger Robot
171694b82e
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: be2190fe64
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Iea9d42d6ce8c804b8cff63ef81ec9bca49aab7ad
2020-05-28 20:09:41 +00:00
TreeHugger Robot
be2190fe64
Merge "Import translations. DO NOT MERGE" into rvc-dev
2020-05-28 19:58:59 +00:00
Bill Yi
049aca9d5e
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I5f6b84e0c2aef2d2c258f6c8dc80a140c04b1153
2020-05-28 19:17:11 +00:00
Bill Yi
18428dce24
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I09d9add17cf33cbe0525e728f4e7a3c19a7aa9f2
2020-05-28 18:38:28 +00:00
TreeHugger Robot
6129b0eb34
Merge "Revert "Do not prebind sticky slices."" into rvc-dev am: 591d761d43
am: a8ebfe9e00
...
Change-Id: I98a080e00085cde55c5ef3a7b9bbc865f3db0181
2020-05-28 16:01:06 +00:00
TreeHugger Robot
691e31b0cf
Merge "Revert "Do not prebind sticky slices."" into rvc-dev am: 591d761d43
am: 1438ab4d59
...
Change-Id: I4d39f1d1b7ad6d0ced731f93b3ac9d39e0209f5b
2020-05-28 16:00:55 +00:00
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
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
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
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
.
Reason for revert: Fix it using another approach in ag/11629780. The prebind part will be helpful to cache slice data.
Bug: 152365480
Change-Id: Iebed42027552a923907647b61480f135ac4f4097
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
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
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
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
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
666b90393f
Merge "EnabledNetworkModePreferenceController Remove AllowedNetworkType am: 259e6288c9
am: 6425a5e7c9" into rvc-d1-dev-plus-aosp
2020-05-28 14:47:24 +00:00