Automerger Merge Worker
8ea88b4fb4
Merge "Merge "[ANR] Settings froze" into rvc-dev am: dd356c5653 am: 29e0d389bf am: 5e9d33f731" into rvc-qpr-dev-plus-aosp
2020-05-29 07:25:01 +00:00
TreeHugger Robot
8a79b6b270
Merge "[ANR] Settings froze" into rvc-dev am: dd356c5653 am: 29e0d389bf am: 5e9d33f731
...
Change-Id: Ic1dbd5c5f35fa87f6376c77bba06b0ff2ad81e23
2020-05-29 07:24:57 +00:00
TreeHugger Robot
54425fd055
Merge "[ANR] Settings froze" into rvc-dev am: dd356c5653 am: 29e0d389bf am: 7392cae089
...
Change-Id: I2b9867a0713c986994239534b59d289f5e42d871
2020-05-29 07:24:52 +00:00
TreeHugger Robot
424c5ad859
Merge "Disable anomaly app detection for battery" into rvc-dev am: 90331c0f20 am: ef95b4781b
...
Change-Id: Ib171336f52c20fc7434cc8adb449df14d7ca9a91
2020-05-29 07:15:25 +00:00
TreeHugger Robot
ee4cdc174c
Merge "Disable anomaly app detection for battery" into rvc-dev am: 90331c0f20 am: 343f6fb26f
...
Change-Id: I60191ff11a25bb9154d74e4d426e1c83f2dd8ebc
2020-05-29 07:15:24 +00:00
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
5e9d33f731
Merge "[ANR] Settings froze" into rvc-dev am: dd356c5653 am: 29e0d389bf
...
Change-Id: Ia55db34ee4d7facbfabc46f7133703569cb172fc
2020-05-29 07:14:59 +00:00
govenliu
90d72813cd
[Wi-Fi] Enhance WifiNoInternetDialogTest unit test cases
...
Add new unit test cases in WifiNoInternetDialogTest.java
The coverage rate of WifiNoInternetDialog will raise from 10% to 95%
Bug: 151696220
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiNoInternetDialogTest
Change-Id: I8256c0adebee9a7f557b467a6ea11cad09e02b33
2020-05-29 14:53:14 +08:00
TreeHugger Robot
343f6fb26f
Merge "Disable anomaly app detection for battery" into rvc-dev am: 90331c0f20
...
Change-Id: I6eed91ca71917570161c31f666c33ead52f873ef
2020-05-29 06:50:16 +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
fc4a5568d4
Merge "Merge "Improve feedback when failing transferring a disconnected device" into rvc-dev am: 6febf2c629 am: 1b1e05fb1d" into rvc-d1-dev-plus-aosp am: ebb199a374 am: ff2d8b1b89
...
Change-Id: I416c0fc74de0ef2ce5a50e22089701e0dca950ea
2020-05-29 06:13:23 +00:00
Automerger Merge Worker
155409f492
Merge "Merge "Improve feedback when failing transferring a disconnected device" into rvc-dev am: 6febf2c629 am: 1b1e05fb1d am: 69f1c522a2" into rvc-qpr-dev-plus-aosp am: e173285ddd
...
Change-Id: I1ad50d3c1a09718f612874758d15833cf160bb68
2020-05-29 06:12:15 +00:00
tim peng
22750c155a
Merge "Improve feedback when failing transferring a disconnected device" into rvc-dev am: 6febf2c629 am: 771ece6156 am: 8b5d909a86 am: cc6ce21c84
...
Change-Id: If389f12b4a79d18d73bdca779049882a835ca3bf
2020-05-29 06:10:56 +00:00
Automerger Merge Worker
ff2d8b1b89
Merge "Merge "Improve feedback when failing transferring a disconnected device" into rvc-dev am: 6febf2c629 am: 1b1e05fb1d" into rvc-d1-dev-plus-aosp am: ebb199a374
...
Change-Id: Ie1b38d4373ab4108b9d2f59e439013168873f032
2020-05-29 05:54:20 +00:00
Automerger Merge Worker
e173285ddd
Merge "Merge "Improve feedback when failing transferring a disconnected device" into rvc-dev am: 6febf2c629 am: 1b1e05fb1d am: 69f1c522a2" into rvc-qpr-dev-plus-aosp
2020-05-29 05:54:10 +00:00
tim peng
cc6ce21c84
Merge "Improve feedback when failing transferring a disconnected device" into rvc-dev am: 6febf2c629 am: 771ece6156 am: 8b5d909a86
...
Change-Id: Idbcae1b4022166acaf668296cfd43bb3147861e2
2020-05-29 05:53:56 +00:00
tim peng
1c4bde0dc5
Merge "Improve feedback when failing transferring a disconnected device" into rvc-dev am: 6febf2c629 am: 1b1e05fb1d am: 69f1c522a2
...
Change-Id: I00ca619a9578bfc3c561540d5cb833a183acecc2
2020-05-29 05:53:56 +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
69f1c522a2
Merge "Improve feedback when failing transferring a disconnected device" into rvc-dev am: 6febf2c629 am: 1b1e05fb1d
...
Change-Id: I9d4758a3b66cf95ade0f9eef250d36e2b44c18de
2020-05-29 05:36:09 +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
57a8f7740e
Merge "Incorrect localization of dark theme custom time" into rvc-dev am: fb6711ae92 am: e931c35f4d am: 867766f919 am: e05aaa40dd
...
Change-Id: I1fb8898844b1c19589f9192745c650bac84f3128
2020-05-29 00:05:51 +00:00
TreeHugger Robot
cc545d0b9c
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 3304eb3fb6 -s ours am: 22c94f426a -s ours am: 53395c5430 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I222e4f1043fa9b92cc84336725f3b4806b7ac2ca
2020-05-29 00:05:44 +00:00
Jay Aliomer
8531253d84
Merge "Incorrect localization of dark theme custom time" into rvc-dev am: fb6711ae92 am: 2f9e6f6ba3 am: bc1d235392 am: 785a3d591a
...
Change-Id: I6adcb5a9fd642d7e1eb09283baa5e434a75c4127
2020-05-29 00:05:37 +00:00
Jay Aliomer
b74593007f
Merge "Incorrect localization of dark theme custom time" into rvc-dev am: fb6711ae92 am: e931c35f4d am: 73a818e99f am: cfebbe6fa6
...
Change-Id: Ie6cce67aac703db052a40d8ec7be98b9ca109905
2020-05-29 00:05:01 +00:00
TreeHugger Robot
835efa7390
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 3304eb3fb6 -s ours am: 83be1b647b -s ours am: 2b4eb7d8ca -s ours
...
am skip reason: subject contains skip directive
Change-Id: I4e5c212014a42fb4ee8a93108b240ed4c3dbc159
2020-05-29 00:04:34 +00:00
Jay Aliomer
e05aaa40dd
Merge "Incorrect localization of dark theme custom time" into rvc-dev am: fb6711ae92 am: e931c35f4d am: 867766f919
...
Change-Id: If8cc90c895e0823f8d74face3af40f998ed45acd
2020-05-28 23:54:02 +00:00
TreeHugger Robot
53395c5430
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 3304eb3fb6 -s ours am: 22c94f426a -s ours
...
am skip reason: subject contains skip directive
Change-Id: I475826fdbf9649c4689d8ad183af1e1910a11150
2020-05-28 23:53:46 +00:00
Jay Aliomer
785a3d591a
Merge "Incorrect localization of dark theme custom time" into rvc-dev am: fb6711ae92 am: 2f9e6f6ba3 am: bc1d235392
...
Change-Id: I160dd5a1e1b3b508f68dcf1e1e20a7fb08ac5e23
2020-05-28 23:51:09 +00:00
Jay Aliomer
cfebbe6fa6
Merge "Incorrect localization of dark theme custom time" into rvc-dev am: fb6711ae92 am: e931c35f4d am: 73a818e99f
...
Change-Id: I74c5492c4d9a0a66b80f4b5b0780938f8407055f
2020-05-28 23:51:02 +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
TreeHugger Robot
2b4eb7d8ca
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 3304eb3fb6 -s ours am: 83be1b647b -s ours
...
am skip reason: subject contains skip directive
Change-Id: If6204490b442e7cdffde5f3f0f735224a94a56b4
2020-05-28 23:50:50 +00:00
Jay Aliomer
867766f919
Merge "Incorrect localization of dark theme custom time" into rvc-dev am: fb6711ae92 am: e931c35f4d
...
Change-Id: Ib8c21c6139fcb69d8abf985303f93e8434beaa07
2020-05-28 23:38:53 +00:00
TreeHugger Robot
22c94f426a
[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: I36f184163f2f990ac913cef2e41b48d362e6834c
2020-05-28 23:38:37 +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
