Stanley Wang
a518a67743
Merge "Fix security issue for using mock location without permission." into qt-qpr1-dev am: 0b76ef19b5 am: b97e3163de am: 3ce4e5171c am: 59e55dfd03 am: 46200b421b
...
Change-Id: Ice248b38ad5d7ec98494bd3a996fed1bb95cdcbe
2020-03-27 04:28:38 +00:00
Chalard Jean
48adfc076e
Adjust code for API council feedback
...
Bug: 151322799
Test: SettingsUnitTests
Merged-In: I5ff389f3f707e5538979830c2252455bea5bbb88
Change-Id: I5ff389f3f707e5538979830c2252455bea5bbb88
2020-03-27 04:28:28 +00:00
Stanley Wang
d820a14828
Merge "Fix security issue for using mock location without permission." into qt-qpr1-dev am: 0b76ef19b5 am: b97e3163de am: 06cecd534b am: 05edaa9f2f am: 14dc3b6885
...
Change-Id: I252e4fb6d764efccb83b7d6a21ff0df46151b265
2020-03-27 04:27:09 +00:00
Automerger Merge Worker
5743265501
Merge "Merge "Update customize button title when state changed" into rvc-dev am: b11a46cfd5 am: 5399c512f3" into rvc-d1-dev-plus-aosp am: 6384124e6b am: 10ed649275
...
Change-Id: I3e3df03e876b72aa9f6afcfc3adbda5a5d13b25e
2020-03-27 04:23:30 +00:00
TreeHugger Robot
b137f1af65
Merge "Update customize button title when state changed" into rvc-dev am: b11a46cfd5 am: 35adcca607 am: 97ac18af4e am: 903b61333c
...
Change-Id: I8a511744142be14f97f5aa24e685f0e5a9792d4b
2020-03-27 04:22:06 +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
TreeHugger Robot
aafd983469
Merge "Import translations. DO NOT MERGE"
2020-03-27 02:16:25 +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
James.cf Lin
9f8edf2b67
Fix showing "Invalid Network Mode 26. Ignore" on Preferred network type
...
After setting the network to telephony framework, Setting UI didn't check this network type when show on the UI and show the invalid string.
Bug: 152373426
Test: manual
Change-Id: Ibf280a9905edcb7bd241a1505e85ac5e83993634
2020-03-27 09:54:08 +08:00
Philip P. Moltmann
bd4ef8eb3a
Merge "Only check op in Settings UI" into rvc-dev am: 1e812204e4 am: d96297e82d am: 370b7006f2 am: 211c103a2a am: 26551165d3
...
Change-Id: I2876023ccb543cc79b360d2ac312466abd4deb95
2020-03-27 01:41:16 +00:00
Xiangyu/Malcolm Chen
1964cc45e3
Merge "Show footer to notify user no 5G in DSDS mode." into rvc-dev am: b0a5905d08 am: 0358e150fb am: 7dd9a37fab am: 7ddf390f0f am: 1da1106869
...
Change-Id: Ic11ee65380d65b91c2067ecc57ead1cec224eb09
2020-03-27 01:39:51 +00:00
Philip P. Moltmann
4749e591dd
Merge "Only check op in Settings UI" into rvc-dev am: 1e812204e4 am: e7466934b7 am: 6ce4efc2a1 am: 6ed0278e1f
...
Change-Id: Iac5d2c12e453f463ff896f5f67742525496aced1
2020-03-27 01:39:02 +00:00
Philip P. Moltmann
5f242c05e3
Merge "Only check op in Settings UI" into rvc-dev am: 1e812204e4 am: d96297e82d am: 716ff8c256 am: b8e47e2ad5
...
Change-Id: Ibb897c94ae09966c3c9983e504b14c2c983ab04e
2020-03-27 01:37:05 +00:00
Automerger Merge Worker
1940ce88a0
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 am: f0def7ceaf
...
Change-Id: Id54d6bb071fa7dbd28bd6356e6d0a7ec0b3355f5
2020-03-27 01:34:45 +00: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
2fab5e95ec
Merge "Show footer to notify user no 5G in DSDS mode." into rvc-dev am: b0a5905d08 am: 0358e150fb am: 90f9b73775 am: e9b0810465
...
Change-Id: I8afa4b655a8a1096d93828b6854c72979699f8d7
2020-03-27 01:33:28 +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
Xiangyu/Malcolm Chen
a99132ab3a
Merge "Show footer to notify user no 5G in DSDS mode." into rvc-dev am: b0a5905d08 am: 0e4d8aa531
...
Change-Id: Iaaf9a087b05d493b1b53a219d9cab9ca6398998c
2020-03-27 00:58:27 +00:00
