Curtis Belmonte
1e510e6ac1
Merge "Set CDC detail string as subtitle, not description" into rvc-dev am: da4f9f7c27 am: 6654372fde
...
Change-Id: I5acfdaf6398efb09a0813c8b30ad98bb62badaa2
2020-03-27 23:02:04 +00:00
Curtis Belmonte
c68465f024
Merge "Set CDC detail string as subtitle, not description" into rvc-dev am: da4f9f7c27 am: 33851b108f
...
Change-Id: I789fafe027e1b105abc7dd59d65bbbad1a979010
2020-03-27 22:55:51 +00:00
Curtis Belmonte
6654372fde
Merge "Set CDC detail string as subtitle, not description" into rvc-dev am: da4f9f7c27
...
Change-Id: Ifa42922dfc21fadf3ff3dbdc32e6f4314f5846cb
2020-03-27 22:48:07 +00:00
Curtis Belmonte
33851b108f
Merge "Set CDC detail string as subtitle, not description" into rvc-dev am: da4f9f7c27
...
Change-Id: Ia6c51e1c80bdf988c3a24f4268ef2130ee549f5b
2020-03-27 22:47:17 +00:00
Curtis Belmonte
da4f9f7c27
Merge "Set CDC detail string as subtitle, not description" into rvc-dev
2020-03-27 22:42:22 +00:00
Julia Reynolds
cfedf81a20
Merge "Fix broken test" into rvc-dev am: 5a950b763f am: e8884576f7
...
Change-Id: I656891f22b7c9b38221263840bc23d3faf618209
2020-03-27 16:27:07 +00:00
Julia Reynolds
ade39e479f
Merge "Fix broken test" into rvc-dev am: 5a950b763f am: 275f372a72
...
Change-Id: I083f196ec1f67e45fcbb6b9b2b6032a51dd0d8d9
2020-03-27 16:17:07 +00:00
Julia Reynolds
e8884576f7
Merge "Fix broken test" into rvc-dev am: 5a950b763f
...
Change-Id: I5fbbdc605987dc3b6080b26c94ced86340ee18c5
2020-03-27 16:12:27 +00:00
Julia Reynolds
275f372a72
Merge "Fix broken test" into rvc-dev am: 5a950b763f
...
Change-Id: If25879aec1e877bb64b1f3e2c831c677f3b80dc9
2020-03-27 15:59:02 +00:00
Julia Reynolds
5a950b763f
Merge "Fix broken test" into rvc-dev
2020-03-27 15:40:47 +00:00
Automerger Merge Worker
f4950d5c35
Merge "Merge "[Wi-Fi] Refactor WifiConnectionPreferenceController with WifiTrackerLib" into rvc-dev am: 50aeb48c56 am: 8fd2e35c3f" into rvc-d1-dev-plus-aosp
2020-03-27 15:17:02 +00:00
TreeHugger Robot
a4a23c4bb8
Merge "[Wi-Fi] Refactor WifiConnectionPreferenceController with WifiTrackerLib" into rvc-dev am: 50aeb48c56 am: 98d770345d
...
Change-Id: Ib9b375e98d6afe20f8d61b37b7c426a5a4708a9f
2020-03-27 15:16:54 +00:00
TreeHugger Robot
4d9c465580
Merge "[Wi-Fi] Refactor WifiConnectionPreferenceController with WifiTrackerLib" into rvc-dev am: 50aeb48c56 am: 8fd2e35c3f
...
Change-Id: I97c3f28aba507ea3de52fc630a3278ebc806b1aa
2020-03-27 15:16:36 +00:00
TreeHugger Robot
8fd2e35c3f
Merge "[Wi-Fi] Refactor WifiConnectionPreferenceController with WifiTrackerLib" into rvc-dev am: 50aeb48c56
...
Change-Id: Ic3e5681d07b89a7cbb15ea68140ee5dd53097e25
2020-03-27 15:05:34 +00:00
TreeHugger Robot
98d770345d
Merge "[Wi-Fi] Refactor WifiConnectionPreferenceController with WifiTrackerLib" into rvc-dev am: 50aeb48c56
...
Change-Id: I3e02884ec575cd33d4541a41a99403d79e79735b
2020-03-27 15:03:51 +00:00
TreeHugger Robot
50aeb48c56
Merge "[Wi-Fi] Refactor WifiConnectionPreferenceController with WifiTrackerLib" into rvc-dev
2020-03-27 14:43:57 +00:00
Automerger Merge Worker
c35adb05e9
Merge "Merge "[Wi-Fi] Fix 3 unit tests fail in WifiMeteredPreferenceController2Test" into rvc-dev am: 5f886e7406 am: ca9dad3430" into rvc-d1-dev-plus-aosp
2020-03-27 14:27:50 +00:00
TreeHugger Robot
f993a22f48
Merge "[Wi-Fi] Fix 3 unit tests fail in WifiMeteredPreferenceController2Test" into rvc-dev am: 5f886e7406 am: ca9dad3430
...
Change-Id: I9c9fbe87b500e9e74c81c75592672353a8a87c0c
2020-03-27 14:27:47 +00:00
TreeHugger Robot
0e6dbd0440
Merge "[Wi-Fi] Fix 3 unit tests fail in WifiMeteredPreferenceController2Test" into rvc-dev am: 5f886e7406 am: b22f48ea5d
...
Change-Id: I251d19f45e4ea543c9c473e18de60820f827631b
2020-03-27 14:27:38 +00:00
TreeHugger Robot
ca9dad3430
Merge "[Wi-Fi] Fix 3 unit tests fail in WifiMeteredPreferenceController2Test" into rvc-dev am: 5f886e7406
...
Change-Id: I6259f15e62ecb2bd18e9430ae79ce7f6f455945d
2020-03-27 14:11:07 +00:00
TreeHugger Robot
b22f48ea5d
Merge "[Wi-Fi] Fix 3 unit tests fail in WifiMeteredPreferenceController2Test" into rvc-dev am: 5f886e7406
...
Change-Id: Ic73beaab9e63e46a642fa089cfa60b1fece0b454
2020-03-27 14:10:48 +00:00
TreeHugger Robot
5f886e7406
Merge "[Wi-Fi] Fix 3 unit tests fail in WifiMeteredPreferenceController2Test" into rvc-dev
2020-03-27 13:53:22 +00:00
Julia Reynolds
83d0de8d07
Fix broken test
...
Test: this
Fixes: 152374833
Change-Id: I9065f6b3700fa288cb3fd65ef2b24c2821325e51
2020-03-27 09:36:18 -04:00
TreeHugger Robot
c37d7e42cb
Merge "Add mocked main looper to test" into rvc-dev am: 493bf6697f am: 2dec388619
...
Change-Id: I7d59420b59cb1fd945f7edfcebe3c08b93d28473
2020-03-27 13:25:17 +00:00
TreeHugger Robot
063208c56c
Merge "Add mocked main looper to test" into rvc-dev am: 493bf6697f am: 857392d25b
...
Change-Id: I2801d08d2ed04e7178e2a57a2a6c38994bcd33d5
2020-03-27 13:24:35 +00:00
TreeHugger Robot
857392d25b
Merge "Add mocked main looper to test" into rvc-dev am: 493bf6697f
...
Change-Id: I17c24d2ab1c3344e985f0dd8427bd74b1a3d50db
2020-03-27 13:12:13 +00:00
TreeHugger Robot
2dec388619
Merge "Add mocked main looper to test" into rvc-dev am: 493bf6697f
...
Change-Id: Ib9a43d9767a1eec78f7961f23ad9835a881d09a4
2020-03-27 13:10:59 +00:00
TreeHugger Robot
493bf6697f
Merge "Add mocked main looper to test" into rvc-dev
2020-03-27 13:00:21 +00:00
Alic Tsai
9cd2e6dd66
Merge "Device details LCR should be show up " ! " with low battery." into rvc-dev am: df8b9acc69 am: 019c186bb7
...
Change-Id: Ib218d307c7ab4b8157196a73841dc2302c4721a9
2020-03-27 12:50:21 +00:00
Alic Tsai
d4ad3f6843
Merge "Device details LCR should be show up " ! " with low battery." into rvc-dev am: df8b9acc69 am: 4d7db64de0
...
Change-Id: I990048d040bb1626a457ab8371d9482ee5053a68
2020-03-27 12:50:04 +00:00
Alic Tsai
019c186bb7
Merge "Device details LCR should be show up " ! " with low battery." into rvc-dev am: df8b9acc69
...
Change-Id: Ie74fcd532cb8ea4ed362b03f8c3b4dc54d73225c
2020-03-27 12:35:19 +00:00
Arc Wang
ebf8ffd8fd
[Wi-Fi] Refactor WifiConnectionPreferenceController with WifiTrackerLib
...
Bug: 152582093
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiConnectionPreferenceControllerTest
Change-Id: I9c0ab0edf5a8e935a2c1afee865bd04304ae6f0f
2020-03-27 20:34:04 +08:00
Alic Tsai
4d7db64de0
Merge "Device details LCR should be show up " ! " with low battery." into rvc-dev am: df8b9acc69
...
Change-Id: Ieeb02f1baee4f3a95d889b21ce873d503d04e3ec
2020-03-27 12:33:50 +00:00
Alic Tsai
df8b9acc69
Merge "Device details LCR should be show up " ! " with low battery." into rvc-dev
2020-03-27 12:20:35 +00:00
Tobias Thierer
949525df32
Merge "OWNERS: Remove tobiast." am: dffcd7a949 am: 21b01bc4f2 am: f5b13fe3b1
...
Change-Id: I3086477ec8f1f3aabe46f3dddf4bbeb0122821e6
2020-03-27 11:57:57 +00:00
Tobias Thierer
f5b13fe3b1
Merge "OWNERS: Remove tobiast." am: dffcd7a949 am: 21b01bc4f2
...
Change-Id: Ie2a65cdd33e7922685153fcb1eb17791fcf562a6
2020-03-27 11:51:34 +00:00
govenliu
a009e44654
[Wi-Fi] Fix 3 unit tests fail in WifiMeteredPreferenceController2Test
...
Fix 3 unit tests fail in WifiMeteredPreferenceController2Test.
Bug: 151696220
Test: Run make RunSettingsRoboTests ROBOTEST_FILTER=WifiMeteredPreferenceController2Test
Change-Id: I1db81c790929387c4fe74f5adb1d323c23b40546
2020-03-27 19:44:14 +08:00
Tobias Thierer
21b01bc4f2
Merge "OWNERS: Remove tobiast." am: dffcd7a949
...
Change-Id: Iad09bc83fa7f258f83ee505a4cd9edf9004f542d
2020-03-27 11:30:14 +00:00
Tobias Thierer
dffcd7a949
Merge "OWNERS: Remove tobiast."
2020-03-27 11:04:12 +00:00
James Lin
4bd53da614
Merge "Fix showing "Invalid Network Mode 26. Ignore" on Preferred network type" into rvc-dev am: a7a3304a20 am: 24c06447db
...
Change-Id: I93b65692b89237f10d2c5811ea67a301b1714e64
2020-03-27 10:29:31 +00:00
James Lin
2f5d2a48c1
Merge "Fix showing "Invalid Network Mode 26. Ignore" on Preferred network type" into rvc-dev am: a7a3304a20 am: 0fa4005981
...
Change-Id: Idc57a86546b7e42adeebf1743ef90fec4baf43a6
2020-03-27 10:29:18 +00:00
James Lin
24c06447db
Merge "Fix showing "Invalid Network Mode 26. Ignore" on Preferred network type" into rvc-dev am: a7a3304a20
...
Change-Id: I8a5a565e71981e4faa323f82424c927783d42e06
2020-03-27 10:14:05 +00:00
James Lin
0fa4005981
Merge "Fix showing "Invalid Network Mode 26. Ignore" on Preferred network type" into rvc-dev am: a7a3304a20
...
Change-Id: Idc7e4d7615f1f23a4205b81a4ef3cd38d6412556
2020-03-27 10:13:53 +00:00
James Lin
a7a3304a20
Merge "Fix showing "Invalid Network Mode 26. Ignore" on Preferred network type" into rvc-dev
2020-03-27 09:56:32 +00:00
TreeHugger Robot
a398c99862
Merge "Add TradeFed test config to SettingsPerfTests" into rvc-dev am: 735fdba4f2 am: c8458cb3b9
...
Change-Id: Ief91d11f0067846f957bef3a40f404f8c67b1088
2020-03-27 08:35:30 +00:00
TreeHugger Robot
62a29dcd4e
Merge "Add TradeFed test config to SettingsPerfTests" into rvc-dev am: 735fdba4f2 am: 5656d63f54
...
Change-Id: I4751289b54ff8452186e8ead5cba1640916c4805
2020-03-27 08:35:16 +00:00
TreeHugger Robot
c8458cb3b9
Merge "Add TradeFed test config to SettingsPerfTests" into rvc-dev am: 735fdba4f2
...
Change-Id: I5f644060868b9880699d8b24593087e6d132db53
2020-03-27 08:20:25 +00:00
TreeHugger Robot
5656d63f54
Merge "Add TradeFed test config to SettingsPerfTests" into rvc-dev am: 735fdba4f2
...
Change-Id: I4b0cfc4d7f6739763340772d905ef56b9629f72d
2020-03-27 08:20:09 +00:00
TreeHugger Robot
735fdba4f2
Merge "Add TradeFed test config to SettingsPerfTests" into rvc-dev
2020-03-27 08:07:51 +00:00
Edgar Wang
158ca96558
Merge "Correct confirm message in Reset options -> Erase all data(factory rest)" into rvc-dev am: d981e24705 am: 890fc578f8
...
Change-Id: I7f42995e54f6025b36a1e61ea0c8859f371f9990
2020-03-27 06:10:54 +00:00
