Commit Graph

63359 Commits

Author SHA1 Message Date
Curtis Belmonte
a477b73b33 Merge "Set CDC detail string as subtitle, not description" into rvc-dev am: da4f9f7c27 am: 33851b108f am: c68465f024 am: aef57e3522
Change-Id: Ic0c00a9c58c2a5f1f3966f365666ede1db24d3da
2020-03-27 23:28:54 +00:00
Curtis Belmonte
aef57e3522 Merge "Set CDC detail string as subtitle, not description" into rvc-dev am: da4f9f7c27 am: 33851b108f am: c68465f024
Change-Id: I9f396f2a651a8a589fd2104e3bbdb70b3d018a74
2020-03-27 23:17:39 +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
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
7927ffe07c Merge "Fix broken test" into rvc-dev am: 5a950b763f am: e8884576f7 am: 6e72355438 am: f33624e7a5 am: c3062aee26
Change-Id: Id799b274ac0a79afbf71936b3c86a8f1882f706a
2020-03-27 16:57:44 +00:00
Julia Reynolds
c3062aee26 Merge "Fix broken test" into rvc-dev am: 5a950b763f am: e8884576f7 am: 6e72355438 am: f33624e7a5
Change-Id: Ia64c5fedc0be3572224413c1050ea4c3e40c9c8d
2020-03-27 16:56:38 +00:00
Julia Reynolds
0b7f006d46 Merge "Fix broken test" into rvc-dev am: 5a950b763f am: e8884576f7 am: cfedf81a20 am: 377fce3022
Change-Id: Ie120ea232c7d001600b01afef637a8757949a03a
2020-03-27 16:51:53 +00:00
Julia Reynolds
d9fe7b36d3 Merge "Fix broken test" into rvc-dev am: 5a950b763f am: 275f372a72 am: ade39e479f am: 364690d789
Change-Id: I0afef276606a4784d0d33bc09f8c133478185e66
2020-03-27 16:50:57 +00:00
Julia Reynolds
f33624e7a5 Merge "Fix broken test" into rvc-dev am: 5a950b763f am: e8884576f7 am: 6e72355438
Change-Id: Ic8a913cee1e813ac893a5b7273bc29fb9b45c0a8
2020-03-27 16:44:44 +00:00
Julia Reynolds
377fce3022 Merge "Fix broken test" into rvc-dev am: 5a950b763f am: e8884576f7 am: cfedf81a20
Change-Id: I00be0fd352d9341d25b0203db1a66b048ad2faac
2020-03-27 16:37:38 +00:00
Julia Reynolds
364690d789 Merge "Fix broken test" into rvc-dev am: 5a950b763f am: 275f372a72 am: ade39e479f
Change-Id: If6213ccda89a2d969b06fa320724ab4d60ad71b3
2020-03-27 16:37:12 +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
6e72355438 Merge "Fix broken test" into rvc-dev am: 5a950b763f am: e8884576f7
Change-Id: Icace17540f1e3bdbb90417019ea5c29f91177f80
2020-03-27 16:26:16 +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
TreeHugger Robot
773ab07671 Merge "[Wi-Fi] Refactor WifiConnectionPreferenceController with WifiTrackerLib" into rvc-dev am: 50aeb48c56 am: 8fd2e35c3f am: 16d8adb1fd am: 28eb1cda17 am: 87b21d58d3
Change-Id: Ic66efd273fcc9aa166b4a77830239fc72e5ad893
2020-03-27 15:55:01 +00:00
Automerger Merge Worker
8277de1794 Merge "Merge "[Wi-Fi] Refactor WifiConnectionPreferenceController with WifiTrackerLib" into rvc-dev am: 50aeb48c56 am: 8fd2e35c3f" into rvc-d1-dev-plus-aosp am: f4950d5c35 am: 021fef826a
Change-Id: Ic9052c46d757db829083f3052628234051f3d5cf
2020-03-27 15:54:55 +00:00
TreeHugger Robot
c9d59be7f2 Merge "[Wi-Fi] Refactor WifiConnectionPreferenceController with WifiTrackerLib" into rvc-dev am: 50aeb48c56 am: 98d770345d am: a4a23c4bb8 am: c2864a8d25
Change-Id: Iecd9bdb47eb40c375fae2b6c0cf5145d7cd1525b
2020-03-27 15:54:27 +00:00
TreeHugger Robot
87b21d58d3 Merge "[Wi-Fi] Refactor WifiConnectionPreferenceController with WifiTrackerLib" into rvc-dev am: 50aeb48c56 am: 8fd2e35c3f am: 16d8adb1fd am: 28eb1cda17
Change-Id: I78ba1e5feaf12b6aa364b13c27eb6dc9a34642a6
2020-03-27 15:45:23 +00:00
Julia Reynolds
5a950b763f Merge "Fix broken test" into rvc-dev 2020-03-27 15:40:47 +00:00
Automerger Merge Worker
021fef826a Merge "Merge "[Wi-Fi] Refactor WifiConnectionPreferenceController with WifiTrackerLib" into rvc-dev am: 50aeb48c56 am: 8fd2e35c3f" into rvc-d1-dev-plus-aosp am: f4950d5c35
Change-Id: Ia966eaaf2850251c7b610d16ba6fe7439b172fee
2020-03-27 15:33:39 +00:00
TreeHugger Robot
c2864a8d25 Merge "[Wi-Fi] Refactor WifiConnectionPreferenceController with WifiTrackerLib" into rvc-dev am: 50aeb48c56 am: 98d770345d am: a4a23c4bb8
Change-Id: I5c8448c9e703c08997ff989f430dab41fc5ef358
2020-03-27 15:33:31 +00:00
TreeHugger Robot
28eb1cda17 Merge "[Wi-Fi] Refactor WifiConnectionPreferenceController with WifiTrackerLib" into rvc-dev am: 50aeb48c56 am: 8fd2e35c3f am: 16d8adb1fd
Change-Id: If4dd1a2dc1e06984f2f642faf4b5d20f86708af4
2020-03-27 15:33:15 +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
16d8adb1fd Merge "[Wi-Fi] Refactor WifiConnectionPreferenceController with WifiTrackerLib" into rvc-dev am: 50aeb48c56 am: 8fd2e35c3f
Change-Id: I5ec1c240b57f8d0fd733929c6921abe251ac7d4f
2020-03-27 15:16:41 +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
994db63249 Merge "[Wi-Fi] Fix 3 unit tests fail in WifiMeteredPreferenceController2Test" into rvc-dev am: 5f886e7406 am: b22f48ea5d am: e8a683eea2 am: f2d518218e am: a054ddec1c
Change-Id: I9e1358d09936392600eda4d91807cad9d906e099
2020-03-27 15:05:25 +00:00
Automerger Merge Worker
f96bd9f060 Merge "Merge "[Wi-Fi] Fix 3 unit tests fail in WifiMeteredPreferenceController2Test" into rvc-dev am: 5f886e7406 am: ca9dad3430" into rvc-d1-dev-plus-aosp am: c35adb05e9 am: 49c8c00d9e
Change-Id: Iece766b4ac0aa7b1b7b6f84731b830cfb9bef437
2020-03-27 15:04:46 +00:00
TreeHugger Robot
a054ddec1c Merge "[Wi-Fi] Fix 3 unit tests fail in WifiMeteredPreferenceController2Test" into rvc-dev am: 5f886e7406 am: b22f48ea5d am: e8a683eea2 am: f2d518218e
Change-Id: Ib29c2aa15e478b8ae0d73897287ca9c582d69030
2020-03-27 15:04:28 +00:00
TreeHugger Robot
0821ce8e47 Merge "[Wi-Fi] Fix 3 unit tests fail in WifiMeteredPreferenceController2Test" into rvc-dev am: 5f886e7406 am: b22f48ea5d am: 0e6dbd0440 am: d86bbbacb7
Change-Id: I0daa3347a2ec6a0a704da492ebba54e9d5020b0e
2020-03-27 15:03:57 +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
49c8c00d9e Merge "Merge "[Wi-Fi] Fix 3 unit tests fail in WifiMeteredPreferenceController2Test" into rvc-dev am: 5f886e7406 am: ca9dad3430" into rvc-d1-dev-plus-aosp am: c35adb05e9
Change-Id: I03000fac013a0c43d97f67e5892a8305848caf02
2020-03-27 14:42:18 +00:00
TreeHugger Robot
f2d518218e Merge "[Wi-Fi] Fix 3 unit tests fail in WifiMeteredPreferenceController2Test" into rvc-dev am: 5f886e7406 am: b22f48ea5d am: e8a683eea2
Change-Id: I3d51a2c3735bf7772c4976662a4a41045cef9789
2020-03-27 14:42:07 +00:00
TreeHugger Robot
d86bbbacb7 Merge "[Wi-Fi] Fix 3 unit tests fail in WifiMeteredPreferenceController2Test" into rvc-dev am: 5f886e7406 am: b22f48ea5d am: 0e6dbd0440
Change-Id: I081843f2436b98ef5281b789f34d165a5ea5b3c5
2020-03-27 14:42:04 +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
e8a683eea2 Merge "[Wi-Fi] Fix 3 unit tests fail in WifiMeteredPreferenceController2Test" into rvc-dev am: 5f886e7406 am: b22f48ea5d
Change-Id: I19eb8446aee7116733e9e094d91c69a860d091f7
2020-03-27 14:27:43 +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
bab000c419 Merge "Add mocked main looper to test" into rvc-dev am: 493bf6697f am: 2dec388619 am: b07f6e35b8 am: bd88ee953e am: e2541579d3
Change-Id: I72ce322573bc4bf572f59bbf61c05fc4a17ccc19
2020-03-27 14:27:24 +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
e2541579d3 Merge "Add mocked main looper to test" into rvc-dev am: 493bf6697f am: 2dec388619 am: b07f6e35b8 am: bd88ee953e
Change-Id: Idddd20f6d1c6d6968f0ef975c9f9acc60cf4e7c4
2020-03-27 14:10:59 +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
Artur Satayev
1ef63edac8 Merge "Do not exlicitly declare dependency on changeid processor." 2020-03-27 14:03:29 +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
TreeHugger Robot
ebff3f6aef Merge "Add mocked main looper to test" into rvc-dev am: 493bf6697f am: 2dec388619 am: c37d7e42cb am: a02d94af8f
Change-Id: I7670c438dc8b241838814121478be37c97120aae
2020-03-27 13:52:34 +00:00