Edgar Wang
86ade48e56
Merge "Remove duplicated search index data of "Live Caption"" into rvc-dev am: 2b01f9ba7d am: 25a0edfb7c
...
Change-Id: I895a22b5e89fc49bf5edb36af8e97c84b553de36
2020-04-17 02:36:31 +00:00
Edgar Wang
23b5b359a0
Merge "Remove duplicated search index data of "Live Caption"" into rvc-dev am: 2b01f9ba7d am: 27c1b456a5
...
Change-Id: Idc8b2c8b62d0f66783c286e526fce434d1581442
2020-04-17 02:36:11 +00:00
Edgar Wang
8dbe5c377d
Merge "Remove duplicated search index data of "Live Caption"" into rvc-dev am: 2b01f9ba7d am: 27c1b456a5
...
Change-Id: I6e85c64be52f96cc93bbf74a5d5bd46f8d89d975
2020-04-17 02:35:58 +00:00
Edgar Wang
25a0edfb7c
Merge "Remove duplicated search index data of "Live Caption"" into rvc-dev am: 2b01f9ba7d
...
Change-Id: Ied0879d5228de1061d4c0cf931be2bcd7ec05b58
2020-04-17 02:13:43 +00:00
Edgar Wang
27c1b456a5
Merge "Remove duplicated search index data of "Live Caption"" into rvc-dev am: 2b01f9ba7d
...
Change-Id: I48970cfd18aef705790b20a6af6e5e9a08a1bc1a
2020-04-17 02:13:30 +00:00
Edgar Wang
2b01f9ba7d
Merge "Remove duplicated search index data of "Live Caption"" into rvc-dev
2020-04-17 01:53:00 +00:00
Eugene Susla
27c3b45ab7
Merge "Implement auto revoke user whitelist intent handler" into rvc-dev am: ff8b793427 am: 1184cec4a2 am: d088583349 am: 5cfdd8ad6b
...
Change-Id: Iaf649ac39708f55757504737c9469a235e8980e4
2020-04-16 23:57:29 +00:00
Weilun Du
f8757b7112
[Settings] Fix crashes caused by null bluetooth adapter and ethernet
...
manager
Emulator system image doesn't support bluetooth and ethernet manager
yet.
BUG: 150408099
Signed-off-by: Weilun Du <wdu@google.com >
Change-Id: Iab4f7b962f01755fe7d84956f9b54374f1e17408
(cherry picked from commit 08e95d0db0
2020-04-16 16:56:28 -07:00
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
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
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
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
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
TreeHugger Robot
3c290d9860
Merge "Support another new intent for mainline module intent" into rvc-dev am: 158bbe17f3 am: 8142527b35 am: 30fdfef476
...
Change-Id: Ib12d4514907430e7987d3500a731dbbaad845252
2020-04-16 11:47:06 +00:00
TreeHugger Robot
c3143fb334
Merge "Support another new intent for mainline module intent" into rvc-dev am: 158bbe17f3 am: 8142527b35 am: 53d317a4d0
...
Change-Id: I56704eb396e7cd5d0ba984cea17383713af0b4e1
2020-04-16 11:46:57 +00:00
TreeHugger Robot
579bdff443
Merge "Support another new intent for mainline module intent" into rvc-dev am: 158bbe17f3 am: 3ca1b39596
...
Change-Id: Id453df151f84942547c7ef96917264b1f198b26d
2020-04-16 11:32:00 +00:00
TreeHugger Robot
53d317a4d0
Merge "Support another new intent for mainline module intent" into rvc-dev am: 158bbe17f3 am: 8142527b35
...
Change-Id: I4d28d4e61aa47db8c4b6e172069605b283a50585
2020-04-16 11:31:59 +00:00
TreeHugger Robot
30fdfef476
Merge "Support another new intent for mainline module intent" into rvc-dev am: 158bbe17f3 am: 8142527b35
...
Change-Id: I392761026ae6e0bd76b5612a2794063c3591ef18
2020-04-16 11:31:47 +00:00
