Commit Graph

63790 Commits

Author SHA1 Message Date
Tobias Thierer
32e960d249 Merge "OWNERS: Remove tobiast." am: dffcd7a949 am: 21b01bc4f2 am: f5b13fe3b1 am: 949525df32 am: 2b55e30d8e
Change-Id: Id4cb3a060938a17eb577a55cc50538b4084e9d9a
2020-03-27 12:20:11 +00:00
Tobias Thierer
2b55e30d8e Merge "OWNERS: Remove tobiast." am: dffcd7a949 am: 21b01bc4f2 am: f5b13fe3b1 am: 949525df32
Change-Id: Ic9983a149fee0fcf8edf0ad4480d0dcc9fb71cf1
2020-03-27 12:07:47 +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
James Lin
3b7972d178 Merge "Fix showing "Invalid Network Mode 26. Ignore" on Preferred network type" into rvc-dev am: a7a3304a20 am: 0fa4005981 am: 373752d45c am: 765c0494dc am: 0e5567a24f
Change-Id: I295a99f24afbb778f02341018ebfffc4cade8468
2020-03-27 11:06:08 +00:00
Tobias Thierer
dffcd7a949 Merge "OWNERS: Remove tobiast." 2020-03-27 11:04:12 +00:00
James Lin
0e5567a24f Merge "Fix showing "Invalid Network Mode 26. Ignore" on Preferred network type" into rvc-dev am: a7a3304a20 am: 0fa4005981 am: 373752d45c am: 765c0494dc
Change-Id: I7351191d57052ededad84496ed60bdb88a4230e9
2020-03-27 10:58:26 +00:00
James Lin
c5726228e6 Merge "Fix showing "Invalid Network Mode 26. Ignore" on Preferred network type" into rvc-dev am: a7a3304a20 am: 24c06447db am: 4bd53da614 am: 432afc0997
Change-Id: I0972e2b143749dc55d952406a6d59fe5e6dcce35
2020-03-27 10:58:21 +00:00
James Lin
dc442ab150 Merge "Fix showing "Invalid Network Mode 26. Ignore" on Preferred network type" into rvc-dev am: a7a3304a20 am: 0fa4005981 am: 2f5d2a48c1 am: b6d18514ae
Change-Id: I5f0b20810ab2038b72dc335bb9516b5469096c6b
2020-03-27 10:58:06 +00:00
James Lin
432afc0997 Merge "Fix showing "Invalid Network Mode 26. Ignore" on Preferred network type" into rvc-dev am: a7a3304a20 am: 24c06447db am: 4bd53da614
Change-Id: I9ec489beb3f54afed0d21b1f253997adfe83bd93
2020-03-27 10:42:02 +00:00
James Lin
765c0494dc Merge "Fix showing "Invalid Network Mode 26. Ignore" on Preferred network type" into rvc-dev am: a7a3304a20 am: 0fa4005981 am: 373752d45c
Change-Id: I90c9a4245d01e0e3ee7319bc2744ba4d1a9faf14
2020-03-27 10:41:48 +00:00
James Lin
b6d18514ae Merge "Fix showing "Invalid Network Mode 26. Ignore" on Preferred network type" into rvc-dev am: a7a3304a20 am: 0fa4005981 am: 2f5d2a48c1
Change-Id: Iec9593af23794a2ef4dc887d85cc03615d226738
2020-03-27 10:41:47 +00:00
James Lin
373752d45c Merge "Fix showing "Invalid Network Mode 26. Ignore" on Preferred network type" into rvc-dev am: a7a3304a20 am: 0fa4005981
Change-Id: I313898b71bb988c071415fbfe48f7f3442a7690a
2020-03-27 10:29:34 +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
8a63689dcb Merge "Add TradeFed test config to SettingsPerfTests" into rvc-dev am: 735fdba4f2 am: 5656d63f54 am: 30cb1ddee7 am: 35a9e8cad5 am: 865be5cbf8
Change-Id: Icbce9dc40f5df495c17499c9695759ce36eba74f
2020-03-27 09:06:53 +00:00
TreeHugger Robot
6fcc92b7c2 Merge "Add TradeFed test config to SettingsPerfTests" into rvc-dev am: 735fdba4f2 am: c8458cb3b9 am: a398c99862 am: 0a23fdb546
Change-Id: I4dbfc4ce1c1bf3509cb61be444d7d97330d0a85a
2020-03-27 09:06:40 +00:00
TreeHugger Robot
865be5cbf8 Merge "Add TradeFed test config to SettingsPerfTests" into rvc-dev am: 735fdba4f2 am: 5656d63f54 am: 30cb1ddee7 am: 35a9e8cad5
Change-Id: I5eae1dbba22c25c48c22477a75a15dc4912e037b
2020-03-27 09:06:27 +00:00
TreeHugger Robot
1c75daf037 Merge "Add TradeFed test config to SettingsPerfTests" into rvc-dev am: 735fdba4f2 am: 5656d63f54 am: 62a29dcd4e am: 53feddff0f
Change-Id: Ic70eb62cbfed8763278c864da625545acd8517cf
2020-03-27 09:06:12 +00:00
TreeHugger Robot
0a23fdb546 Merge "Add TradeFed test config to SettingsPerfTests" into rvc-dev am: 735fdba4f2 am: c8458cb3b9 am: a398c99862
Change-Id: I9edea5a579bdd0c4552ed5627906fbd30d6eadb4
2020-03-27 08:47:51 +00:00
TreeHugger Robot
35a9e8cad5 Merge "Add TradeFed test config to SettingsPerfTests" into rvc-dev am: 735fdba4f2 am: 5656d63f54 am: 30cb1ddee7
Change-Id: Ie909aded611808c9ca45da27caa4955a327ef7f2
2020-03-27 08:47:47 +00:00
TreeHugger Robot
53feddff0f Merge "Add TradeFed test config to SettingsPerfTests" into rvc-dev am: 735fdba4f2 am: 5656d63f54 am: 62a29dcd4e
Change-Id: Id5e0c36e8237d81b44d67c46224b0b0e1d890d5e
2020-03-27 08:47:46 +00:00
TreeHugger Robot
30cb1ddee7 Merge "Add TradeFed test config to SettingsPerfTests" into rvc-dev am: 735fdba4f2 am: 5656d63f54
Change-Id: I7897beb3af66d1f9b09ded36108dd3c56013eef7
2020-03-27 08:35:30 +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
fa54456059 Merge "Correct confirm message in Reset options -> Erase all data(factory rest)" into rvc-dev am: d981e24705 am: eb6820393e am: dfc1d3a654 am: a7e049581e am: 118d961125
Change-Id: I8ac907f948af0cbef3b22245488c52c54e2917a7
2020-03-27 06:43:59 +00:00
Edgar Wang
5aa10b4c9a Merge "Correct confirm message in Reset options -> Erase all data(factory rest)" into rvc-dev am: d981e24705 am: 890fc578f8 am: 158ca96558 am: f7c6541bde
Change-Id: I86a27f8fa60e2c114bdcfe0a07eac6ac3657bc82
2020-03-27 06:43:20 +00:00
Edgar Wang
118d961125 Merge "Correct confirm message in Reset options -> Erase all data(factory rest)" into rvc-dev am: d981e24705 am: eb6820393e am: dfc1d3a654 am: a7e049581e
Change-Id: I743a3d70f871ad6ef63f04612e2466c85c2229f9
2020-03-27 06:42:54 +00:00
Edgar Wang
ecc880efb5 Merge "Correct confirm message in Reset options -> Erase all data(factory rest)" into rvc-dev am: d981e24705 am: eb6820393e am: 1d1edc8737 am: c6f7da3787
Change-Id: I9f57fb58181c8c6e78aad4d8cb09d8649513cde3
2020-03-27 06:42:37 +00:00
Edgar Wang
f7c6541bde Merge "Correct confirm message in Reset options -> Erase all data(factory rest)" into rvc-dev am: d981e24705 am: 890fc578f8 am: 158ca96558
Change-Id: I1bdac3df5d7bc31963647a60d4195590aab6d3e0
2020-03-27 06:26:20 +00:00
Edgar Wang
c6f7da3787 Merge "Correct confirm message in Reset options -> Erase all data(factory rest)" into rvc-dev am: d981e24705 am: eb6820393e am: 1d1edc8737
Change-Id: Id931be08bc0706fd2321bf6482357f8467a47879
2020-03-27 06:25:53 +00:00
Edgar Wang
a7e049581e Merge "Correct confirm message in Reset options -> Erase all data(factory rest)" into rvc-dev am: d981e24705 am: eb6820393e am: dfc1d3a654
Change-Id: I8ade27a865c83109eb4150e99fff3adc4a5414d9
2020-03-27 06:25:49 +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
dfc1d3a654 Merge "Correct confirm message in Reset options -> Erase all data(factory rest)" into rvc-dev am: d981e24705 am: eb6820393e
Change-Id: I632a61fc3a576f6dc91f3f08ad96d429cd62ff19
2020-03-27 06:10:46 +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
TreeHugger Robot
ed96a844b3 Merge "Import translations. DO NOT MERGE" 2020-03-27 04:46:37 +00:00
Stanley Wang
86c699626e Merge "Fix security issue for using mock location without permission." into qt-qpr1-dev am: 0b76ef19b5 am: b97e3163de am: 3ce4e5171c am: d17f33c675 am: e9027091d3 am: 3adf6f5ad7
Change-Id: If1bd382127608e020bf9fd8d0b6f2f5bac716cf4
2020-03-27 04:29:57 +00:00
TreeHugger Robot
bf9ae49023 Merge "Update customize button title when state changed" into rvc-dev am: b11a46cfd5 am: 5399c512f3 am: 9a7d5e058a am: c42efe72b9 am: 7328fbc5ef
Change-Id: Ica4751f38d165466f92ec5cb982c9858aa3850b8
2020-03-27 04:29:20 +00:00