Commit Graph

65800 Commits

Author SHA1 Message Date
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
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
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
803b14ed9f Merge "Import translations. DO NOT MERGE" 2020-04-16 15:37:05 +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
Julia Reynolds
34c66fd94e Merge "Launch subscreens with the correct user" into rvc-dev am: 0c99ecaec1 am: f1801907d8
Change-Id: I8ec8602c1e8753ce03d4c6acc75dcdf58be8c24e
2020-04-16 14:26:36 +00:00
Julia Reynolds
abf784e5a2 Merge "Launch subscreens with the correct user" into rvc-dev am: 0c99ecaec1 am: 27d039315f
Change-Id: I6a31ded37ad8365bf19a86eae4b709128f3fd944
2020-04-16 14:26:27 +00:00
Julia Reynolds
d2d8115ac9 Merge "Launch subscreens with the correct user" into rvc-dev am: 0c99ecaec1 am: f1801907d8
Change-Id: Iddf2bda7005bffe799b76f9a21d8937925fee693
2020-04-16 14:25:55 +00:00
Julia Reynolds
27d039315f Merge "Launch subscreens with the correct user" into rvc-dev am: 0c99ecaec1
Change-Id: I739234dc3861dba8de2502424dbca9ee454c5b50
2020-04-16 14:12:43 +00:00
Julia Reynolds
f1801907d8 Merge "Launch subscreens with the correct user" into rvc-dev am: 0c99ecaec1
Change-Id: I40f34bf9f15c76ad1474a8d6096d47027d37b13a
2020-04-16 14:12:27 +00:00
Julia Reynolds
0c99ecaec1 Merge "Launch subscreens with the correct user" into rvc-dev 2020-04-16 13:57:50 +00:00
Sunny Shao
d63c5ebff5 Fix incorrect app count displayed under special app access
- This special app Google Play services will change its hasLauncherEntry
  value after receiving the MSG_LOAD_LAUNCHER.
- Update the summary while SpecialAppAccessPreferenceController is
  receiving the onLauncherInfoChanged callback.

Fixes: 150480524
Test: manual test
Change-Id: I26b99fce54606644ee5603b4ca4730267c0f7ce5
2020-04-16 21:38:03 +08:00
Tom Hsu
b3bc413443 Revert "Fix failures on com.android.settings.network.ApnEditorTest"
This reverts commit 66a530ec97.

Reason for revert: <have useless code>

Change-Id: Ic3190e168e74f196ef29a3af4e41fbb2ae129d17
2020-04-16 13:08:16 +00:00
TreeHugger Robot
af8a4c4f02 Merge "Support another new intent for mainline module intent" into rvc-dev am: 158bbe17f3 am: 8142527b35 am: 53d317a4d0 am: c3143fb334 am: 1aaa1cad3f
Change-Id: Ib55594a26bd68469e3bd37ca6ff4c76f636866e9
2020-04-16 11:58:43 +00:00
TreeHugger Robot
6588e7d549 Merge "Support another new intent for mainline module intent" into rvc-dev am: 158bbe17f3 am: 3ca1b39596 am: 579bdff443 am: 742e5af8f9
Change-Id: I47e600f05804318c7b72f3761272c7c304400751
2020-04-16 11:58:30 +00:00
TreeHugger Robot
1aaa1cad3f Merge "Support another new intent for mainline module intent" into rvc-dev am: 158bbe17f3 am: 8142527b35 am: 53d317a4d0 am: c3143fb334
Change-Id: I307706f75aaf5fb6ae332b38b7faa0f96d2c2cf9
2020-04-16 11:58:00 +00:00
TreeHugger Robot
6313dd37e9 Merge "Support another new intent for mainline module intent" into rvc-dev am: 158bbe17f3 am: 8142527b35 am: 30fdfef476 am: 3c290d9860
Change-Id: I27ec15f9f0e3c9a6902b1754177b4d93d6c6c655
2020-04-16 11:57:47 +00:00
TreeHugger Robot
742e5af8f9 Merge "Support another new intent for mainline module intent" into rvc-dev am: 158bbe17f3 am: 3ca1b39596 am: 579bdff443
Change-Id: I4a400c4dc12ff76e7454a464366fb602af88e12e
2020-04-16 11:47:36 +00:00