TreeHugger Robot
5020254ef2
Merge "[Wi-Fi] Fix exception when WifiTracker2 callbacks to Wi-Fi Settings" into rvc-dev am: dea87bd85b am: 7f0a093f5c am: 637a548baa am: a6f85fc927
...
Change-Id: I02397e02e26bda10939b767c9e22fd36d7d23f99
2020-03-23 03:34:57 +00:00
Automerger Merge Worker
cf7d7145ad
Merge "Merge "[Wi-Fi] Fix exception when WifiTracker2 callbacks to Wi-Fi Settings" into rvc-dev am: dea87bd85b am: 7f0a093f5c" into rvc-d1-dev-plus-aosp am: f6465f9aa8
...
Change-Id: I1e0472f8e01cedbf634624580f0af297bb60449a
2020-03-23 03:18:36 +00:00
TreeHugger Robot
22c2b61ee2
Merge "[Wi-Fi] Fix exception when WifiTracker2 callbacks to Wi-Fi Settings" into rvc-dev am: dea87bd85b am: d582019b63 am: 742539e288
...
Change-Id: I5c3b5a8539d7ed79e883dbf486a3ced0f7fcaee3
2020-03-23 03:18:06 +00:00
TreeHugger Robot
a6f85fc927
Merge "[Wi-Fi] Fix exception when WifiTracker2 callbacks to Wi-Fi Settings" into rvc-dev am: dea87bd85b am: 7f0a093f5c am: 637a548baa
...
Change-Id: Ia08c737da781a74bb96dcb9abeebf8d0fdd8ff88
2020-03-23 03:17:25 +00:00
Automerger Merge Worker
f6465f9aa8
Merge "Merge "[Wi-Fi] Fix exception when WifiTracker2 callbacks to Wi-Fi Settings" into rvc-dev am: dea87bd85b am: 7f0a093f5c" into rvc-d1-dev-plus-aosp
2020-03-23 03:04:02 +00:00
TreeHugger Robot
47c78f4f72
Merge "[Wi-Fi] Fix exception when WifiTracker2 callbacks to Wi-Fi Settings" into rvc-dev am: dea87bd85b am: 7f0a093f5c
...
Change-Id: Ia60fb17751ca5520b4b733c30312cb992696f02e
2020-03-23 03:03:57 +00:00
TreeHugger Robot
742539e288
Merge "[Wi-Fi] Fix exception when WifiTracker2 callbacks to Wi-Fi Settings" into rvc-dev am: dea87bd85b am: d582019b63
...
Change-Id: I94f44d842f761994649ba7ca1e0211c2c0a4cea4
2020-03-23 03:03:54 +00:00
tim peng
328e909489
Merge "Update header information in output switcher" into rvc-dev am: f8f1b271b1 am: 30bc781200 am: f76f1f41ee am: 5d30497d73
...
Change-Id: I03869e5f5ab9e252411e98c3cd2dd7ab27665a8f
2020-03-23 03:03:50 +00:00
TreeHugger Robot
637a548baa
Merge "[Wi-Fi] Fix exception when WifiTracker2 callbacks to Wi-Fi Settings" into rvc-dev am: dea87bd85b am: 7f0a093f5c
...
Change-Id: I7feb5a370c5a80a6d78a2a418c31ada4f8d63a28
2020-03-23 03:03:44 +00:00
TreeHugger Robot
d582019b63
Merge "[Wi-Fi] Fix exception when WifiTracker2 callbacks to Wi-Fi Settings" into rvc-dev am: dea87bd85b
...
Change-Id: I2573e4a5f478a60bc07424dec42b828ccb6e642e
2020-03-23 02:42:30 +00:00
TreeHugger Robot
7f0a093f5c
Merge "[Wi-Fi] Fix exception when WifiTracker2 callbacks to Wi-Fi Settings" into rvc-dev am: dea87bd85b
...
Change-Id: Icc3236048ae0cd07f4bb623bc59830332813584b
2020-03-23 02:41:45 +00:00
tim peng
919f4f0a5b
Merge "Update header information in output switcher" into rvc-dev am: f8f1b271b1 am: f51bd0decb am: a58a21ff01
...
Change-Id: I18e82a465478c5b5346fa64146c9f9bc30c60ce1
2020-03-23 02:41:29 +00:00
tim peng
5d30497d73
Merge "Update header information in output switcher" into rvc-dev am: f8f1b271b1 am: 30bc781200 am: f76f1f41ee
...
Change-Id: Ib299a6fdb5c49873fd2c64cce9edc7fe0a046aa3
2020-03-23 02:41:07 +00:00
tim peng
a1185b6c2c
Merge "Update header information in output switcher" into rvc-dev am: f8f1b271b1 am: 30bc781200 am: 7b1b527b13
...
Change-Id: Iaf4221ca0bcb2e74ea166d917fca5c62fc1397c0
2020-03-23 02:41:07 +00:00
tim peng
a58a21ff01
Merge "Update header information in output switcher" into rvc-dev am: f8f1b271b1 am: f51bd0decb
...
Change-Id: I4935e45a9193949275f5300ee33e9cf421bc8079
2020-03-23 02:14:15 +00:00
tim peng
f76f1f41ee
Merge "Update header information in output switcher" into rvc-dev am: f8f1b271b1 am: 30bc781200
...
Change-Id: I2da55a8a664d165be81f5fe82ac3bb4d1fb52b65
2020-03-23 02:14:04 +00:00
tim peng
7b1b527b13
Merge "Update header information in output switcher" into rvc-dev am: f8f1b271b1 am: 30bc781200
...
Change-Id: I81fae7c73c5bd96aabcae7156e0fef98a49ed633
2020-03-23 02:13:40 +00:00
TreeHugger Robot
dea87bd85b
Merge "[Wi-Fi] Fix exception when WifiTracker2 callbacks to Wi-Fi Settings" into rvc-dev
2020-03-23 02:07:56 +00:00
tim peng
f51bd0decb
Merge "Update header information in output switcher" into rvc-dev am: f8f1b271b1
...
Change-Id: I2406caf1ecdb217658c310f4db948c627adcf790
2020-03-23 01:59:00 +00:00
tim peng
30bc781200
Merge "Update header information in output switcher" into rvc-dev am: f8f1b271b1
...
Change-Id: I07b28fccc7cc1285506c18b5579350fbdcca23e2
2020-03-23 01:58:34 +00:00
tim peng
f8f1b271b1
Merge "Update header information in output switcher" into rvc-dev
2020-03-23 01:47:25 +00:00
Arc Wang
263930d8b4
[Wi-Fi] Fix ignored tests in WifiDetailPreferenceController2Test - I
...
Some tests are removed because WifiTracerLib listens to most intents
and callbacks to Settings APP, most of the receiving intent tests are
removed.
Bug: 151696220
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiDetailPreferenceController2Test
Change-Id: Id88a5c9276457e329840e72711bd06e51a03dd1f
2020-03-23 09:42:35 +08:00
Stanley Wang
c97b40924b
Merge "Update Settings subtexts for R." into rvc-dev am: fb39c70875 am: 76c2ec77e3 am: 3277ad0cf6 am: bfaf9af026
...
Change-Id: I6ca4256ba736d8675d0fc4c4430f9c94813530c5
2020-03-21 06:41:41 +00:00
Stanley Wang
5bedf5a2dd
[automerger skipped] Merge "Update Settings strings for R." into rvc-dev am: 61e7d2c24c am: a8d78418c0 am: 83d06ef1f4 am: adc4662924 -s ours
...
am skip reason: Change-Id Id2d89287fe36240d71de2092daac44a5da9be282 with SHA-1 58f9ae3096
2020-03-21 06:41:31 +00:00
Stanley Wang
f6d654d16a
Merge "Update Settings subtexts for R." into rvc-dev am: fb39c70875 am: 78e9bdf9b7 am: ef2bc18b14
...
Change-Id: Ic157f20dbb2695ed1a86262f3e510e1e2c2899b1
2020-03-21 06:29:59 +00:00
Stanley Wang
39e41746e2
[automerger skipped] Merge "Update Settings strings for R." into rvc-dev am: 61e7d2c24c am: 6c6837424d -s ours am: ba8e20218e -s ours
...
am skip reason: Change-Id Id2d89287fe36240d71de2092daac44a5da9be282 with SHA-1 58f9ae3096
2020-03-21 06:29:53 +00:00
Stanley Wang
cc773fc5d9
Merge "Update Settings subtexts for R." into rvc-dev am: fb39c70875 am: 76c2ec77e3 am: b9289ea2ef
...
Change-Id: I70dfd7ac286182637fb9516f61c5505f683ff3e9
2020-03-21 06:29:45 +00:00
Stanley Wang
a56081dff6
Merge "Update Settings strings for R." into rvc-dev am: 61e7d2c24c am: a8d78418c0 am: ca95aaae17
...
Change-Id: I76b5095d8b6badcba8e075107278724781d363c2
2020-03-21 06:29:15 +00:00
Stanley Wang
bfaf9af026
Merge "Update Settings subtexts for R." into rvc-dev am: fb39c70875 am: 76c2ec77e3 am: 3277ad0cf6
...
Change-Id: Ic8a90fee9e0e5741046b17762161062bc140d049
2020-03-21 06:27:58 +00:00
Stanley Wang
adc4662924
Merge "Update Settings strings for R." into rvc-dev am: 61e7d2c24c am: a8d78418c0 am: 83d06ef1f4
...
Change-Id: Ia58b6202a8e5abba5b39a0887ee491ffd8679ada
2020-03-21 06:27:19 +00:00
Stanley Wang
ef2bc18b14
Merge "Update Settings subtexts for R." into rvc-dev am: fb39c70875 am: 78e9bdf9b7
...
Change-Id: I22cb0a9367e8ecf02b73e5507e735d90aeff61fc
2020-03-21 06:05:47 +00:00
Stanley Wang
3277ad0cf6
Merge "Update Settings subtexts for R." into rvc-dev am: fb39c70875 am: 76c2ec77e3
...
Change-Id: Ida303b4590886c38e90f8e233920db186102269f
2020-03-21 06:05:27 +00:00
Stanley Wang
ba8e20218e
[automerger skipped] Merge "Update Settings strings for R." into rvc-dev am: 61e7d2c24c am: 6c6837424d -s ours
...
am skip reason: Change-Id Id2d89287fe36240d71de2092daac44a5da9be282 with SHA-1 58f9ae3096
2020-03-21 06:05:13 +00:00
Stanley Wang
83d06ef1f4
Merge "Update Settings strings for R." into rvc-dev am: 61e7d2c24c am: a8d78418c0
...
Change-Id: Ib375c8aee3658797113370493feb7e7d527a8939
2020-03-21 06:04:18 +00:00
Stanley Wang
b9289ea2ef
Merge "Update Settings subtexts for R." into rvc-dev am: fb39c70875 am: 76c2ec77e3
...
Change-Id: I1dfbb0dd95d894ff970b11f858a6ca69cf621405
2020-03-21 06:04:00 +00:00
Stanley Wang
ca95aaae17
Merge "Update Settings strings for R." into rvc-dev am: 61e7d2c24c am: a8d78418c0
...
Change-Id: Ie23a43915338769acbaebc4e3547397afd95a4b6
2020-03-21 06:03:47 +00:00
Stanley Wang
78e9bdf9b7
Merge "Update Settings subtexts for R." into rvc-dev am: fb39c70875
...
Change-Id: Iaeda191d1877ae40f0b3911cea911a876da97f0b
2020-03-21 05:49:32 +00:00
Stanley Wang
6c6837424d
Merge "Update Settings strings for R." into rvc-dev am: 61e7d2c24c
...
Change-Id: If6f30aa662c0fd4696722df8e7f31b49b7929157
2020-03-21 05:49:25 +00:00
Stanley Wang
76c2ec77e3
Merge "Update Settings subtexts for R." into rvc-dev am: fb39c70875
...
Change-Id: I35d894cd31031fa8019ca7b6f1552dcd0b1c1412
2020-03-21 05:49:13 +00:00
Stanley Wang
a8d78418c0
Merge "Update Settings strings for R." into rvc-dev am: 61e7d2c24c
...
Change-Id: I87df8f40a569b89d2275d5ce38e379eb3f9f96b9
2020-03-21 05:48:43 +00:00
Stanley Wang
fb39c70875
Merge "Update Settings subtexts for R." into rvc-dev
2020-03-21 05:30:25 +00:00
Stanley Wang
61e7d2c24c
Merge "Update Settings strings for R." into rvc-dev
2020-03-21 05:30:00 +00:00
TreeHugger Robot
c459111b66
Merge "Fix ContextualAdaptiveSleepSliceTest" into rvc-dev am: a4e3d5ef8b am: 17c6211285 am: 3baeb593c7 am: c8fcfd82d9
...
Change-Id: If4f129050b9b8fb22afbc75a241622b2ccba4c05
2020-03-21 04:07:48 +00:00
TreeHugger Robot
c8fcfd82d9
Merge "Fix ContextualAdaptiveSleepSliceTest" into rvc-dev am: a4e3d5ef8b am: 17c6211285 am: 3baeb593c7
...
Change-Id: I42a007cfacde7d1ae1fc91220866afe8fd13538b
2020-03-21 03:56:12 +00:00
TreeHugger Robot
2df4eb3518
Merge "Fix ContextualAdaptiveSleepSliceTest" into rvc-dev am: a4e3d5ef8b am: 981d9e37cb am: 0677fed3e5
...
Change-Id: Idbbbe9977b25d038137fb0ab6ac1a6170e3d88c7
2020-03-21 03:55:14 +00:00
TreeHugger Robot
1e734997b0
Merge "Fix ContextualAdaptiveSleepSliceTest" into rvc-dev am: a4e3d5ef8b am: 17c6211285 am: 3e87cf919d
...
Change-Id: Ib9efb227322d05a7560edbb0e16b5b8d28880563
2020-03-21 03:54:13 +00:00
TreeHugger Robot
3baeb593c7
Merge "Fix ContextualAdaptiveSleepSliceTest" into rvc-dev am: a4e3d5ef8b am: 17c6211285
...
Change-Id: I193e8c5cb34efe53d9b62953fe8c3cddca485707
2020-03-21 03:39:45 +00:00
TreeHugger Robot
0677fed3e5
Merge "Fix ContextualAdaptiveSleepSliceTest" into rvc-dev am: a4e3d5ef8b am: 981d9e37cb
...
Change-Id: Ie18bb3d1d1cb3a9e376ff7fb8ab88b1cffd4adfa
2020-03-21 03:38:38 +00:00
TreeHugger Robot
3e87cf919d
Merge "Fix ContextualAdaptiveSleepSliceTest" into rvc-dev am: a4e3d5ef8b am: 17c6211285
...
Change-Id: I7b84db149a1410e1fb495b493690c7ae98d73dbb
2020-03-21 03:38:12 +00:00
TreeHugger Robot
17c6211285
Merge "Fix ContextualAdaptiveSleepSliceTest" into rvc-dev am: a4e3d5ef8b
...
Change-Id: I5b2b39c33b525407b1b6da300dc853704f727061
2020-03-21 03:14:30 +00:00
