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
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
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
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
e5358d39d7
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: be2190fe64 -s ours am: 171694b82e -s ours am: 4bd0678f8d -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ifff040da521b8b0a5a0eb86b2fd427783514f5ae
2020-05-28 20:42:40 +00:00
TreeHugger Robot
13d2ad4f12
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: be2190fe64 -s ours am: 171694b82e -s ours am: ccb6c24c76 -s ours
...
am skip reason: subject contains skip directive
Change-Id: If88543b1f31a0762c83d320a9c835fde144c3383
2020-05-28 20:42:28 +00:00
TreeHugger Robot
c18e67ab2a
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: be2190fe64 -s ours am: d33f82d74d -s ours am: 7b20181315 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I2381414dd4ce40b2cbdd61494ed858e7154ff8a5
2020-05-28 20:42:18 +00:00
TreeHugger Robot
ccb6c24c76
[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: I610e1391362a307dfba04724aba4c87ad4688f76
2020-05-28 20:25:40 +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
Automerger Merge Worker
d2e4b4e292
Merge "Merge "Revert "Do not prebind sticky slices."" into rvc-dev am: 591d761d43 am: a8ebfe9e00 am: 6129b0eb34" into rvc-qpr-dev-plus-aosp
2020-05-28 16:14:03 +00:00
Automerger Merge Worker
d7296747bf
Merge "Merge "Revert "Do not prebind sticky slices."" into rvc-dev am: 591d761d43 am: 1438ab4d59 am: 85f4ab8a57" into rvc-qpr-dev-plus-aosp
2020-05-28 16:13:58 +00:00
TreeHugger Robot
a59379e943
Merge "Revert "Do not prebind sticky slices."" into rvc-dev am: 591d761d43 am: a8ebfe9e00 am: 6129b0eb34
...
Change-Id: I343ac676905f3af9bbdf56774f2db02a0d63aa48
2020-05-28 16:13:57 +00:00
Automerger Merge Worker
2d256d5ca8
Merge "Merge "Revert "Do not prebind sticky slices."" into rvc-dev am: 591d761d43 am: 1438ab4d59 am: 691e31b0cf" into rvc-qpr-dev-plus-aosp
2020-05-28 16:13:55 +00:00
TreeHugger Robot
7f82f68d09
Merge "Revert "Do not prebind sticky slices."" into rvc-dev am: 591d761d43 am: 1438ab4d59 am: 85f4ab8a57
...
Change-Id: I1cc8afa726ee4e0e19cdedef09af6b3fdd6211bd
2020-05-28 16:13:53 +00:00
Automerger Merge Worker
5416f137d5
Merge "Merge "Increase the timeout for contextual card loading." into rvc-dev am: c3b262ed52 am: 1d1e16a09b am: a498b95ddb" into rvc-qpr-dev-plus-aosp
2020-05-28 16:13:51 +00:00
TreeHugger Robot
6dda236172
Merge "Revert "Do not prebind sticky slices."" into rvc-dev am: 591d761d43 am: 1438ab4d59 am: 691e31b0cf
...
Change-Id: Id5649b46d15c0888686e0364ec140306d05efded
2020-05-28 16:13:50 +00:00
TreeHugger Robot
96d7595eb9
Merge "Increase the timeout for contextual card loading." into rvc-dev am: c3b262ed52 am: 1d1e16a09b am: a498b95ddb
...
Change-Id: I094ccb42ecda4be06a5de18390c3f9adde9f88b7
2020-05-28 16:13:47 +00:00
Automerger Merge Worker
0b68f1f04b
Merge "Merge "Increase the timeout for contextual card loading." into rvc-dev am: c3b262ed52 am: 7a89d57820" into rvc-d1-dev-plus-aosp am: 22a8cba196
...
Change-Id: I026e76177c81ae058f9f7c1907d95dd91a3010c2
2020-05-28 16:13:43 +00:00
TreeHugger Robot
b6de518b1c
Merge "Increase the timeout for contextual card loading." into rvc-dev am: c3b262ed52 am: 1d1e16a09b am: 7a71c443d3
...
Change-Id: I1125adc186c88de153a517736195f4bc98c37bbc
2020-05-28 16:13:11 +00:00
paulhu
a788a3190c
Forward the ResultReceiver to Tethering Entitlement app
...
Bug: 156336264
Test: atest TetherProvisioningActivityTest
Change-Id: I37fcaddd5569223146ff9d6316d97f33312d8d24
Merged-In: I37fcaddd5569223146ff9d6316d97f33312d8d24
2020-05-29 00:06:52 +08:00
