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
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
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
Edgar Wang
1d1edc8737
Merge "Correct confirm message in Reset options -> Erase all data(factory rest)" into rvc-dev am: d981e24705
am: eb6820393e
...
Change-Id: I54572bfb11b5134ed69352e34eb8fb5a520c9290
2020-03-27 06:10:46 +00:00
Edgar Wang
890fc578f8
Merge "Correct confirm message in Reset options -> Erase all data(factory rest)" into rvc-dev am: d981e24705
...
Change-Id: If1815f491e3824dfe75e2e677a4effbddb7f73fe
2020-03-27 05:53:21 +00:00
Edgar Wang
eb6820393e
Merge "Correct confirm message in Reset options -> Erase all data(factory rest)" into rvc-dev am: d981e24705
...
Change-Id: Ibc0389101fac1dd531dbbe7c925cc1ff6160570f
2020-03-27 05:53:15 +00:00
Edgar Wang
d981e24705
Merge "Correct confirm message in Reset options -> Erase all data(factory rest)" into rvc-dev
2020-03-27 05:40:33 +00:00
alictsai
6b76eb0ab6
Device details LCR should be show up " ! " with low battery.
...
screenshot:
https://screenshot.googleplex.com/f72YS3THutW.png
https://screenshot.googleplex.com/v6uw7XsOs9x.png
Bug: 151187813
Test: make -j42 RunSettingsRoboTests
Change-Id: Iabb4ac54e6f827f54cd7c5512995f185875e4a06
2020-03-27 13:14:01 +08:00
Stanley Wang
59e55dfd03
Merge "Fix security issue for using mock location without permission." into qt-qpr1-dev am: 0b76ef19b5
am: b97e3163de
am: 3ce4e5171c
...
Change-Id: I292e9afed86dcfebc35f947bac6ae50cfcdc6be9
2020-03-27 03:41:43 +00:00
Stanley Wang
05edaa9f2f
Merge "Fix security issue for using mock location without permission." into qt-qpr1-dev am: 0b76ef19b5
am: b97e3163de
am: 06cecd534b
...
Change-Id: Ib881ec3a58971098d81218085a95d5ac696a6845
2020-03-27 03:41:35 +00:00
Automerger Merge Worker
6384124e6b
Merge "Merge "Update customize button title when state changed" into rvc-dev am: b11a46cfd5
am: 5399c512f3" into rvc-d1-dev-plus-aosp
2020-03-27 03:41:15 +00:00
TreeHugger Robot
96a39bdc8b
Merge "Update customize button title when state changed" into rvc-dev am: b11a46cfd5
am: 5399c512f3
...
Change-Id: I82e2b74170df4f971c9f11520e7f9450940cc9b1
2020-03-27 03:41:11 +00:00
TreeHugger Robot
97ac18af4e
Merge "Update customize button title when state changed" into rvc-dev am: b11a46cfd5
am: 35adcca607
...
Change-Id: Iff0c0c929a0619136585ded70a975f3777c55c01
2020-03-27 03:41:09 +00:00
Stanley Wang
06cecd534b
Merge "Fix security issue for using mock location without permission." into qt-qpr1-dev am: 0b76ef19b5
am: b97e3163de
...
Change-Id: Ic0ed3b423535e29aa54bbe89779ca46e1529f2c6
2020-03-27 03:29:19 +00:00
Stanley Wang
3ce4e5171c
Merge "Fix security issue for using mock location without permission." into qt-qpr1-dev am: 0b76ef19b5
am: b97e3163de
...
Change-Id: I6fa862418dd602dd000796b4a3ca28df241204be
2020-03-27 03:28:49 +00:00
TreeHugger Robot
35adcca607
Merge "Update customize button title when state changed" into rvc-dev am: b11a46cfd5
...
Change-Id: Ida02e3e49ab0210d8494d6e919b5048895f1eae0
2020-03-27 03:28:47 +00:00
TreeHugger Robot
5399c512f3
Merge "Update customize button title when state changed" into rvc-dev am: b11a46cfd5
...
Change-Id: I47a54efbdbcb2b052cd4ba04881630109bd7dd52
2020-03-27 03:28:19 +00:00
Stanley Wang
b97e3163de
Merge "Fix security issue for using mock location without permission." into qt-qpr1-dev am: 0b76ef19b5
...
Change-Id: I033881dc09b05940f3bf5915de8df09e7c4f762c
2020-03-27 03:20:50 +00:00
TreeHugger Robot
b11a46cfd5
Merge "Update customize button title when state changed" into rvc-dev
2020-03-27 03:17:25 +00:00
Stanley Wang
0b76ef19b5
Merge "Fix security issue for using mock location without permission." into qt-qpr1-dev
2020-03-27 03:09:09 +00:00
Raff Tsai
2a295fbc12
Add TradeFed test config to SettingsPerfTests
...
Bug: 145109184
Test: rebuild
Change-Id: Ib21e96c4588583826e363b0a89c23692ac677fe0
2020-03-27 10:15:40 +08:00