Commit Graph

66051 Commits

Author SHA1 Message Date
Eugene Susla
666342ac19 Merge "Implement auto revoke user whitelist intent handler" into rvc-dev am: ff8b793427 am: 1184cec4a2 am: 4badcb534a
Change-Id: Iaa1c9162d9b7d2fc04da92851f6616bbc6765570
2020-04-16 23:43:15 +00:00
Eugene Susla
f9219ef916 Merge "Implement auto revoke user whitelist intent handler" into rvc-dev am: ff8b793427 am: c3694e0673 am: 13ac9a08b7
Change-Id: I7f8feddfc0e77d92eeefbfc40b0bdc40353f9f7d
2020-04-16 23:43:01 +00:00
Eugene Susla
5cfdd8ad6b Merge "Implement auto revoke user whitelist intent handler" into rvc-dev am: ff8b793427 am: 1184cec4a2 am: d088583349
Change-Id: I854650864de7323c517e9e219c991411d2626da3
2020-04-16 23:42:32 +00:00
Eugene Susla
4badcb534a Merge "Implement auto revoke user whitelist intent handler" into rvc-dev am: ff8b793427 am: 1184cec4a2
Change-Id: I1cee2e94828a984510e891b42cd9c933aece1241
2020-04-16 23:28:40 +00:00
Eugene Susla
13ac9a08b7 Merge "Implement auto revoke user whitelist intent handler" into rvc-dev am: ff8b793427 am: c3694e0673
Change-Id: I109895eab02f67829b160e90adacb0dcb826e546
2020-04-16 23:28:21 +00:00
Eugene Susla
d088583349 Merge "Implement auto revoke user whitelist intent handler" into rvc-dev am: ff8b793427 am: 1184cec4a2
Change-Id: I34a643bf08482d3bbbdc8e97f24377082593dd2f
2020-04-16 23:28:19 +00:00
Eugene Susla
c3694e0673 Merge "Implement auto revoke user whitelist intent handler" into rvc-dev am: ff8b793427
Change-Id: If3c06332beb2aec7658af48afd5354e4aa5fe050
2020-04-16 23:12:05 +00:00
Eugene Susla
1184cec4a2 Merge "Implement auto revoke user whitelist intent handler" into rvc-dev am: ff8b793427
Change-Id: Ifc857fe8d776d8353d8787a9ce0521f7495a821e
2020-04-16 23:12:00 +00:00
Eugene Susla
ff8b793427 Merge "Implement auto revoke user whitelist intent handler" into rvc-dev 2020-04-16 22:52:45 +00:00
tom hsu
969a6a613c Fix failures on com.android.settings.network.ApnEditorTest
Bug: 152376182
Test: make RunSettingsRoboTests
Change-Id: Ib718a4ed0163e07be748857a0dc7b2af92036c3f
2020-04-17 03:45:40 +08:00
TreeHugger Robot
b29fa615b4 Merge "Fallback to AOSP emergency info if the original intent is broken" into rvc-dev am: afbf9e60c0 am: 8f39c1380c am: 58b434ad02 am: 90dbc28e57 am: 5756db17a5 am: d01a5ca39f
Change-Id: Ia39abe58839e20f70e22064a5aa43362ab1ecd9b
2020-04-16 17:07:40 +00:00
TreeHugger Robot
dce9be1266 Merge "Fallback to AOSP emergency info if the original intent is broken" into rvc-dev am: afbf9e60c0 am: 8f6de85b27 am: 91c31662d9 am: 8fa5dd8f8d am: 893c02543c
Change-Id: Ie9cb42daa71cb61d973615da39807222c18661fd
2020-04-16 17:07:33 +00:00
TreeHugger Robot
2e44559a77 Merge "Fallback to AOSP emergency info if the original intent is broken" into rvc-dev am: afbf9e60c0 am: 8f39c1380c am: bafc52f0f0 am: 5e159c017c am: 88ab771034
Change-Id: I6e0d871f510bbad9c3d9cc73a89fcfd72ca34427
2020-04-16 17:07:17 +00:00
TreeHugger Robot
d01a5ca39f Merge "Fallback to AOSP emergency info if the original intent is broken" into rvc-dev am: afbf9e60c0 am: 8f39c1380c am: 58b434ad02 am: 90dbc28e57 am: 5756db17a5
Change-Id: Ia39fa168a383ca0c8492b9eda50f436c86cb17d6
2020-04-16 16:56:33 +00:00
TreeHugger Robot
893c02543c Merge "Fallback to AOSP emergency info if the original intent is broken" into rvc-dev am: afbf9e60c0 am: 8f6de85b27 am: 91c31662d9 am: 8fa5dd8f8d
Change-Id: I41ae9edf5ae77b26304762d6d6040351b97ee2bd
2020-04-16 16:56:14 +00:00
TreeHugger Robot
88ab771034 Merge "Fallback to AOSP emergency info if the original intent is broken" into rvc-dev am: afbf9e60c0 am: 8f39c1380c am: bafc52f0f0 am: 5e159c017c
Change-Id: I9ce7751d0ae92ba6dc13c8204a5882364a62fb0c
2020-04-16 16:55:33 +00:00
TreeHugger Robot
5756db17a5 Merge "Fallback to AOSP emergency info if the original intent is broken" into rvc-dev am: afbf9e60c0 am: 8f39c1380c am: 58b434ad02 am: 90dbc28e57
Change-Id: I2c5ba52b4cd72b5f7199d31fc7ebbd8b30797b1e
2020-04-16 16:54:55 +00:00
TreeHugger Robot
8fa5dd8f8d Merge "Fallback to AOSP emergency info if the original intent is broken" into rvc-dev am: afbf9e60c0 am: 8f6de85b27 am: 91c31662d9
Change-Id: I3625922cc558e25b30e8008148c92994e2930115
2020-04-16 16:42:31 +00:00
TreeHugger Robot
5e159c017c Merge "Fallback to AOSP emergency info if the original intent is broken" into rvc-dev am: afbf9e60c0 am: 8f39c1380c am: bafc52f0f0
Change-Id: Ibc058dec0f9a09193b671cbf9ad2df27b9896681
2020-04-16 16:42:21 +00:00
TreeHugger Robot
90dbc28e57 Merge "Fallback to AOSP emergency info if the original intent is broken" into rvc-dev am: afbf9e60c0 am: 8f39c1380c am: 58b434ad02
Change-Id: I6a9c98ab6eb996c678bd5c9e005959a5449dbfc6
2020-04-16 16:42:19 +00:00
TreeHugger Robot
91c31662d9 Merge "Fallback to AOSP emergency info if the original intent is broken" into rvc-dev am: afbf9e60c0 am: 8f6de85b27
Change-Id: Ie097c989f8d2e9baf11825e4267b9503f8946f3a
2020-04-16 16:29:59 +00:00
TreeHugger Robot
58b434ad02 Merge "Fallback to AOSP emergency info if the original intent is broken" into rvc-dev am: afbf9e60c0 am: 8f39c1380c
Change-Id: I0b32dd33d9713759978b16effc55bbe2e197fff6
2020-04-16 16:29:56 +00:00
TreeHugger Robot
bafc52f0f0 Merge "Fallback to AOSP emergency info if the original intent is broken" into rvc-dev am: afbf9e60c0 am: 8f39c1380c
Change-Id: I3c86265ed7e91afe94b7b36ec2252f998758ea2c
2020-04-16 16:29:43 +00:00
TreeHugger Robot
8f6de85b27 Merge "Fallback to AOSP emergency info if the original intent is broken" into rvc-dev am: afbf9e60c0
Change-Id: I21981e1ceb800febebd1f4e5d819ea4831eb3896
2020-04-16 16:16:22 +00:00
TreeHugger Robot
3871ae9ba4 [automerger skipped] Merge "Import translations. DO NOT MERGE" am: 01652c79dc -s ours
am skip reason: subject contains skip directive

Change-Id: Ifb0b5284ee0043745b077674bf5e05479a919f34
2020-04-16 16:16:21 +00:00
TreeHugger Robot
8f39c1380c Merge "Fallback to AOSP emergency info if the original intent is broken" into rvc-dev am: afbf9e60c0
Change-Id: I921ee0886440878a8ec0c231cb511019148be8f5
2020-04-16 16:16:16 +00:00
TreeHugger Robot
afbf9e60c0 Merge "Fallback to AOSP emergency info if the original intent is broken" into rvc-dev 2020-04-16 16:01:43 +00:00
TreeHugger Robot
01652c79dc Merge "Import translations. DO NOT MERGE" 2020-04-16 16:01:34 +00:00
TreeHugger Robot
192ff6315d [automerger skipped] Merge "Import translations. DO NOT MERGE" am: 803b14ed9f -s ours
am skip reason: subject contains skip directive

Change-Id: I7d83530fd2a19356f0add6dcf5e6bc77741a0cc3
2020-04-16 15:49:36 +00:00
TreeHugger Robot
803b14ed9f Merge "Import translations. DO NOT MERGE" 2020-04-16 15:37:05 +00:00
Tom Hsu
2464cecfe2 Merge "Revert "Fix failures on com.android.settings.network.ApnEditorTest"" am: b22f5daf13
Change-Id: Idd76e12881532f7d09d6a205bbde7ec4ab0da8f0
2020-04-16 15:27:33 +00:00
Julia Reynolds
9584874663 Merge "Launch subscreens with the correct user" into rvc-dev am: 0c99ecaec1 am: f1801907d8 am: 34c66fd94e am: 5b949236c4 am: d399bf68ca am: 83d71c1f8f
Change-Id: I99f1a02fbcfbcd7c808094b124408b221019f2ae
2020-04-16 15:27:28 +00:00
TreeHugger Robot
7cc0e2892f [automerger skipped] Merge "Import translations. DO NOT MERGE" into mainline-prod am: 307ee6b828 -s ours am: 674dc8c05c -s ours am: d86bfc9abb -s ours
am skip reason: subject contains skip directive

Change-Id: I320c9d14dd87f8142f3b37ccadf13b545591594b
2020-04-16 15:27:17 +00:00
TreeHugger Robot
ff998c1dfb [automerger skipped] Merge "Import translations. DO NOT MERGE" into mainline-prod am: 15a22292f8 -s ours am: 1236118a6e -s ours am: 06407ffc75 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie7b9f353b4c9be5bc038a252412c97e05312ffa8
2020-04-16 15:26:51 +00:00
Julia Reynolds
88e216ecfd Merge "Launch subscreens with the correct user" into rvc-dev am: 0c99ecaec1 am: 27d039315f am: abf784e5a2 am: 235cdb1681 am: 039fbbe558
Change-Id: I3d81abfe7234da18de72e9bef82e9a0b4bd98ba7
2020-04-16 15:25:55 +00:00
Julia Reynolds
b3c28393f6 Merge "Launch subscreens with the correct user" into rvc-dev am: 0c99ecaec1 am: f1801907d8 am: d2d8115ac9 am: fb328c7bc6 am: dbef46a5d5
Change-Id: I61923f6b40f0c7300886682d67bcd6ea1f79b656
2020-04-16 15:22:20 +00:00
Tom Hsu
b22f5daf13 Merge "Revert "Fix failures on com.android.settings.network.ApnEditorTest"" 2020-04-16 15:05:40 +00:00
Julia Reynolds
83d71c1f8f Merge "Launch subscreens with the correct user" into rvc-dev am: 0c99ecaec1 am: f1801907d8 am: 34c66fd94e am: 5b949236c4 am: d399bf68ca
Change-Id: I5976b1870aa94a14bbcf38fd21041fe1a8b65e3e
2020-04-16 14:56:48 +00:00
TreeHugger Robot
d86bfc9abb [automerger skipped] Merge "Import translations. DO NOT MERGE" into mainline-prod am: 307ee6b828 -s ours am: 674dc8c05c -s ours
am skip reason: subject contains skip directive

Change-Id: I316000e7890022a1ec64b7828faaddd49fe51c75
2020-04-16 14:56:17 +00:00
TreeHugger Robot
06407ffc75 [automerger skipped] Merge "Import translations. DO NOT MERGE" into mainline-prod am: 15a22292f8 -s ours am: 1236118a6e -s ours
am skip reason: subject contains skip directive

Change-Id: I94d3d6fe492e9cdc8299e49b07bcca1e491d680a
2020-04-16 14:55:58 +00:00
Julia Reynolds
039fbbe558 Merge "Launch subscreens with the correct user" into rvc-dev am: 0c99ecaec1 am: 27d039315f am: abf784e5a2 am: 235cdb1681
Change-Id: Iedf11fe0a0e34213f0944247052c6ee86088e17d
2020-04-16 14:55:04 +00:00
Julia Reynolds
dbef46a5d5 Merge "Launch subscreens with the correct user" into rvc-dev am: 0c99ecaec1 am: f1801907d8 am: d2d8115ac9 am: fb328c7bc6
Change-Id: I8384671d90c0bb08df14840ddd9813129da63bfd
2020-04-16 14:53:53 +00:00
Julia Reynolds
d399bf68ca Merge "Launch subscreens with the correct user" into rvc-dev am: 0c99ecaec1 am: f1801907d8 am: 34c66fd94e am: 5b949236c4
Change-Id: Idbe504d740ffce1c54f4a255b6cad974fe52d64f
2020-04-16 14:50:09 +00:00
TreeHugger Robot
674dc8c05c [automerger skipped] Merge "Import translations. DO NOT MERGE" into mainline-prod am: 307ee6b828 -s ours
am skip reason: subject contains skip directive

Change-Id: I66006b3f388e333d7809af9acd3a68ba1f74e3cc
2020-04-16 14:50:00 +00:00
TreeHugger Robot
1236118a6e [automerger skipped] Merge "Import translations. DO NOT MERGE" into mainline-prod am: 15a22292f8 -s ours
am skip reason: subject contains skip directive

Change-Id: Ied14a6c608b8d588bbb4abe839178eecead5cdde
2020-04-16 14:49:54 +00:00
Julia Reynolds
235cdb1681 Merge "Launch subscreens with the correct user" into rvc-dev am: 0c99ecaec1 am: 27d039315f am: abf784e5a2
Change-Id: I10c0ddc94426795bbe7518cc3eb5168a1d7610d7
2020-04-16 14:44:00 +00:00
Julia Reynolds
fb328c7bc6 Merge "Launch subscreens with the correct user" into rvc-dev am: 0c99ecaec1 am: f1801907d8 am: d2d8115ac9
Change-Id: I328786dafc9442534bda6c4118476610ede3fdfc
2020-04-16 14:42:45 +00:00
Julia Reynolds
5b949236c4 Merge "Launch subscreens with the correct user" into rvc-dev am: 0c99ecaec1 am: f1801907d8 am: 34c66fd94e
Change-Id: I52a20c4411220162db138f6f9b5e8bdc0c07084e
2020-04-16 14:42:43 +00:00
TreeHugger Robot
307ee6b828 Merge "Import translations. DO NOT MERGE" into mainline-prod 2020-04-16 14:34:26 +00:00
TreeHugger Robot
15a22292f8 Merge "Import translations. DO NOT MERGE" into mainline-prod 2020-04-16 14:34:23 +00:00