Commit Graph

62360 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
Stanley Wang
3adf6f5ad7 Merge "Fix security issue for using mock location without permission." into qt-qpr1-dev am: 0b76ef19b5 am: b97e3163de am: 3ce4e5171c am: d17f33c675 am: e9027091d3
Change-Id: I813afd81cea475a8606eab713e20bec2ba578732
2020-03-27 04:20:51 +00:00
TreeHugger Robot
7328fbc5ef Merge "Update customize button title when state changed" into rvc-dev am: b11a46cfd5 am: 5399c512f3 am: 9a7d5e058a am: c42efe72b9
Change-Id: I3e49950e6ef3d94911bf24da2088f27414c236e9
2020-03-27 04:20:28 +00:00
Stanley Wang
e9027091d3 Merge "Fix security issue for using mock location without permission." into qt-qpr1-dev am: 0b76ef19b5 am: b97e3163de am: 3ce4e5171c am: d17f33c675
Change-Id: Iaf17f0a7c64615386dce77eaca2fa78fedc1b0e3
2020-03-27 03:59:52 +00:00
TreeHugger Robot
c42efe72b9 Merge "Update customize button title when state changed" into rvc-dev am: b11a46cfd5 am: 5399c512f3 am: 9a7d5e058a
Change-Id: I7fbf2215267e54742bceba5f160c9f5b2dea609e
2020-03-27 03:59:46 +00:00
Stanley Wang
46200b421b Merge "Fix security issue for using mock location without permission." into qt-qpr1-dev am: 0b76ef19b5 am: b97e3163de am: 3ce4e5171c am: 59e55dfd03
Change-Id: Ib5da9f4d788faff59e5a3c71826f8f69a25230b2
2020-03-27 03:59:38 +00:00
Stanley Wang
14dc3b6885 Merge "Fix security issue for using mock location without permission." into qt-qpr1-dev am: 0b76ef19b5 am: b97e3163de am: 06cecd534b am: 05edaa9f2f
Change-Id: I60d892998dbe63e35f4d6164567794fd0618625b
2020-03-27 03:59:32 +00:00
Automerger Merge Worker
10ed649275 Merge "Merge "Update customize button title when state changed" into rvc-dev am: b11a46cfd5 am: 5399c512f3" into rvc-d1-dev-plus-aosp am: 6384124e6b
Change-Id: I4fac319adb2c11d3b9ae68d512f5d9ba3a043af6
2020-03-27 03:59:25 +00:00
TreeHugger Robot
903b61333c Merge "Update customize button title when state changed" into rvc-dev am: b11a46cfd5 am: 35adcca607 am: 97ac18af4e
Change-Id: Ide01e863e146153213ee0e1d652830f9a1ccb12d
2020-03-27 03:59:14 +00: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
d17f33c675 Merge "Fix security issue for using mock location without permission." into qt-qpr1-dev am: 0b76ef19b5 am: b97e3163de am: 3ce4e5171c
Change-Id: Ie3a0270c31d3f90efd6df5dcd4dbe40d11305bb6
2020-03-27 03:41:42 +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
TreeHugger Robot
9a7d5e058a Merge "Update customize button title when state changed" into rvc-dev am: b11a46cfd5 am: 5399c512f3
Change-Id: I9a1ae7b561196f5a518fd38cbf7ed6429fe647db
2020-03-27 03:41:05 +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
Philip P. Moltmann
26551165d3 Merge "Only check op in Settings UI" into rvc-dev am: 1e812204e4 am: d96297e82d am: 370b7006f2 am: 211c103a2a
Change-Id: Ia4288ecc0ca1ea1b746f20f6d482679e58d35bc5
2020-03-27 01:33:44 +00:00
Xiangyu/Malcolm Chen
1da1106869 Merge "Show footer to notify user no 5G in DSDS mode." into rvc-dev am: b0a5905d08 am: 0358e150fb am: 7dd9a37fab am: 7ddf390f0f
Change-Id: Ic2af4512bc4736acb7231856e5dc6632759672e7
2020-03-27 01:33:08 +00:00
Philip P. Moltmann
6ed0278e1f Merge "Only check op in Settings UI" into rvc-dev am: 1e812204e4 am: e7466934b7 am: 6ce4efc2a1
Change-Id: I80484612731766437a9241c0aad6ecb3b8924100
2020-03-27 01:22:42 +00:00
Philip P. Moltmann
211c103a2a Merge "Only check op in Settings UI" into rvc-dev am: 1e812204e4 am: d96297e82d am: 370b7006f2
Change-Id: I2e23ce74d9a69d7f0f1bc55cda579288c222795f
2020-03-27 01:22:23 +00:00
Philip P. Moltmann
b8e47e2ad5 Merge "Only check op in Settings UI" into rvc-dev am: 1e812204e4 am: d96297e82d am: 716ff8c256
Change-Id: I84eeb20ce13d2d5139a7deb6c00ddad83cda6bc6
2020-03-27 01:21:47 +00:00
Xiangyu/Malcolm Chen
7ddf390f0f Merge "Show footer to notify user no 5G in DSDS mode." into rvc-dev am: b0a5905d08 am: 0358e150fb am: 7dd9a37fab
Change-Id: If3589146aa20756db9696b98e12e1ba68ba68d5c
2020-03-27 01:21:04 +00:00
Automerger Merge Worker
f0def7ceaf Merge "Merge "Show footer to notify user no 5G in DSDS mode." into rvc-dev am: b0a5905d08 am: 0e4d8aa531" into rvc-d1-dev-plus-aosp am: 17ec2206f3
Change-Id: Ib19b6434590732f77b36c2f6a929dc11dbaa57dd
2020-03-27 01:18:34 +00:00
Xiangyu/Malcolm Chen
e9b0810465 Merge "Show footer to notify user no 5G in DSDS mode." into rvc-dev am: b0a5905d08 am: 0358e150fb am: 90f9b73775
Change-Id: I01062a8b381ee5cf318ee4912905f7e49d5548a3
2020-03-27 01:16:37 +00:00
Philip P. Moltmann
370b7006f2 Merge "Only check op in Settings UI" into rvc-dev am: 1e812204e4 am: d96297e82d
Change-Id: I438f78f5935a60fc32bc620cde6b5591e4b12c26
2020-03-27 01:10:08 +00:00
Xiangyu/Malcolm Chen
7dd9a37fab Merge "Show footer to notify user no 5G in DSDS mode." into rvc-dev am: b0a5905d08 am: 0358e150fb
Change-Id: I66bd7594261e21af7bbc235c70cabb7d327e0a3f
2020-03-27 01:07:14 +00:00
Philip P. Moltmann
6ce4efc2a1 Merge "Only check op in Settings UI" into rvc-dev am: 1e812204e4 am: e7466934b7
Change-Id: I1fa90dc38669d315f63405a2f14deab2ed906dab
2020-03-27 00:59:51 +00:00
Philip P. Moltmann
716ff8c256 Merge "Only check op in Settings UI" into rvc-dev am: 1e812204e4 am: d96297e82d
Change-Id: Ie7713b153c189a48770f91d85e6b4562d7bd1842
2020-03-27 00:59:36 +00:00
Automerger Merge Worker
17ec2206f3 Merge "Merge "Show footer to notify user no 5G in DSDS mode." into rvc-dev am: b0a5905d08 am: 0e4d8aa531" into rvc-d1-dev-plus-aosp 2020-03-27 00:58:34 +00:00