Zhen Zhang
d098662e35
Merge "[Settings] Fix crashes caused by null bluetooth adapter and ethernet manager" into rvc-dev am: 7e3e5dfa06 am: 987a70e750 am: 9ed9c96d7c am: bd50104e8f
...
Change-Id: I68996650ed9c5ccceb09fad546e3c47184ec9ab0
2020-04-17 03:51:46 +00:00
Zhen Zhang
bd50104e8f
Merge "[Settings] Fix crashes caused by null bluetooth adapter and ethernet manager" into rvc-dev am: 7e3e5dfa06 am: 987a70e750 am: 9ed9c96d7c
...
Change-Id: I1c2df7a61efbbf0317b4e77816d99e51a9a065de
2020-04-17 03:38:24 +00:00
Zhen Zhang
9ed9c96d7c
Merge "[Settings] Fix crashes caused by null bluetooth adapter and ethernet manager" into rvc-dev am: 7e3e5dfa06 am: 987a70e750
...
Change-Id: Id92f2edb0527b8f27a7c838a778831639c68d80a
2020-04-17 03:22:45 +00:00
Edgar Wang
84ac80c5af
Merge "Remove duplicated search index data of "Live Caption"" into rvc-dev am: 2b01f9ba7d am: 27c1b456a5 am: 23b5b359a0 am: d6379749f5 am: 329c891b6f
...
Change-Id: I7e83d167b4745fa920039e3847eca91bd0675de3
2020-04-17 03:07:24 +00:00
Edgar Wang
01fabc60f0
Merge "Remove duplicated search index data of "Live Caption"" into rvc-dev am: 2b01f9ba7d am: 25a0edfb7c am: 86ade48e56 am: 80a8094607
...
Change-Id: I454305cc9d52be708bf7948d86200e58afe6079e
2020-04-17 03:06:41 +00:00
Edgar Wang
bbbc5f4588
Merge "Remove duplicated search index data of "Live Caption"" into rvc-dev am: 2b01f9ba7d am: 27c1b456a5 am: 8dbe5c377d am: f23979373f
...
Change-Id: I9390908f22794af157228014a5ff6e23df19ab68
2020-04-17 03:06:06 +00:00
Edgar Wang
329c891b6f
Merge "Remove duplicated search index data of "Live Caption"" into rvc-dev am: 2b01f9ba7d am: 27c1b456a5 am: 23b5b359a0 am: d6379749f5
...
Change-Id: Iac63e0fa41caecb1d88aba6b10dc01ca6fb542f6
2020-04-17 03:05:37 +00:00
Zhen Zhang
987a70e750
Merge "[Settings] Fix crashes caused by null bluetooth adapter and ethernet manager" into rvc-dev am: 7e3e5dfa06
...
Change-Id: If882edbe92b6efa5407be82528664b80f20d3e3f
2020-04-17 03:05:22 +00:00
Zhen Zhang
7e3e5dfa06
Merge "[Settings] Fix crashes caused by null bluetooth adapter and ethernet manager" into rvc-dev
2020-04-17 02:56:50 +00:00
Edgar Wang
80a8094607
Merge "Remove duplicated search index data of "Live Caption"" into rvc-dev am: 2b01f9ba7d am: 25a0edfb7c am: 86ade48e56
...
Change-Id: I5ecd515cf908df459f24fbbdcc511857ace089e0
2020-04-17 02:51:22 +00:00
Edgar Wang
f23979373f
Merge "Remove duplicated search index data of "Live Caption"" into rvc-dev am: 2b01f9ba7d am: 27c1b456a5 am: 8dbe5c377d
...
Change-Id: I9a351190ef42dadfb215f147a34bcbcbaa0298ef
2020-04-17 02:49:20 +00:00
Edgar Wang
d6379749f5
Merge "Remove duplicated search index data of "Live Caption"" into rvc-dev am: 2b01f9ba7d am: 27c1b456a5 am: 23b5b359a0
...
Change-Id: I89c2d1cc0d87dd3ad6c44aa19a864e5b952d224a
2020-04-17 02:49:07 +00:00
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
ef9a92ac0a
Merge "Implement auto revoke user whitelist intent handler" into rvc-dev am: ff8b793427 am: 1184cec4a2 am: d088583349 am: 5cfdd8ad6b am: 27c3b45ab7
...
Change-Id: I45f4d404ec239b39e4eacfbc6ee877e4d45b6397
2020-04-16 23:58:10 +00:00
Eugene Susla
42a3f6f2b0
Merge "Implement auto revoke user whitelist intent handler" into rvc-dev am: ff8b793427 am: 1184cec4a2 am: 4badcb534a am: 666342ac19
...
Change-Id: I99622856cf9f28cf2962d46883b2cf0d064282d3
2020-04-16 23:57:47 +00:00
Eugene Susla
ad89cab6b2
Merge "Implement auto revoke user whitelist intent handler" into rvc-dev am: ff8b793427 am: c3694e0673 am: 13ac9a08b7 am: f9219ef916
...
Change-Id: If301ec594419edc05c162f1b551f08f06f55ac06
2020-04-16 23:57:32 +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
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
