Tom Hsu
3abd5e2051
Merge "Fix failures on com.android.settings.network.ApnEditorTest" into rvc-dev am: 7c84dc9959 am: a733ead043 am: 857d656932 am: 791d1150aa am: 36a649dbbb
...
Change-Id: I63481103b808982df9073cd328239f162804adb6
2020-04-17 05:13:07 +00:00
Tom Hsu
1ec85f8a71
Merge "Fix failures on com.android.settings.network.ApnEditorTest" into rvc-dev am: 7c84dc9959 am: a733ead043 am: b41218c2c5 am: b779272f1f
...
Change-Id: I0db20d67ec2d13dffa416fa4bfe82c8d9503b92c
2020-04-17 05:12:46 +00:00
Tom Hsu
77ea4e4f92
Merge "Fix failures on com.android.settings.network.ApnEditorTest" into rvc-dev am: 7c84dc9959 am: 68f1de2a53 am: 4cf73d2013 am: a1eeca3949
...
Change-Id: Idea1197a5437680b3812cd4ad22a670fb1fd1215
2020-04-17 05:12:28 +00:00
Tom Hsu
36a649dbbb
Merge "Fix failures on com.android.settings.network.ApnEditorTest" into rvc-dev am: 7c84dc9959 am: a733ead043 am: 857d656932 am: 791d1150aa
...
Change-Id: I20f2f641bb4f2932c9f37fd5fe0d7ca7370b31a9
2020-04-17 05:12:08 +00:00
Tom Hsu
b779272f1f
Merge "Fix failures on com.android.settings.network.ApnEditorTest" into rvc-dev am: 7c84dc9959 am: a733ead043 am: b41218c2c5
...
Change-Id: I66ce4ff95f116853fcfc117fde5cdbfe75400309
2020-04-17 04:58:58 +00:00
Tom Hsu
a1eeca3949
Merge "Fix failures on com.android.settings.network.ApnEditorTest" into rvc-dev am: 7c84dc9959 am: 68f1de2a53 am: 4cf73d2013
...
Change-Id: I2b02a394f24e2966743cd9c9763d822c768d5b78
2020-04-17 04:57:24 +00:00
Tom Hsu
791d1150aa
Merge "Fix failures on com.android.settings.network.ApnEditorTest" into rvc-dev am: 7c84dc9959 am: a733ead043 am: 857d656932
...
Change-Id: I851677c1e927f19bcc27686a1c8ffe8d3448a36e
2020-04-17 04:57:16 +00:00
Tom Hsu
b41218c2c5
Merge "Fix failures on com.android.settings.network.ApnEditorTest" into rvc-dev am: 7c84dc9959 am: a733ead043
...
Change-Id: I575aa821b24dbe8e2c9ae9144912c04e2bf08396
2020-04-17 04:45:03 +00:00
Tom Hsu
857d656932
Merge "Fix failures on com.android.settings.network.ApnEditorTest" into rvc-dev am: 7c84dc9959 am: a733ead043
...
Change-Id: I6cc2492adeb4ed057f23c1d8e94209c6f6d897bf
2020-04-17 04:44:38 +00:00
Tom Hsu
4cf73d2013
Merge "Fix failures on com.android.settings.network.ApnEditorTest" into rvc-dev am: 7c84dc9959 am: 68f1de2a53
...
Change-Id: I15e426aa232e07314e16c1cf875525cc645fe4ea
2020-04-17 04:44:32 +00:00
Tom Hsu
68f1de2a53
Merge "Fix failures on com.android.settings.network.ApnEditorTest" into rvc-dev am: 7c84dc9959
...
Change-Id: I3f950f8a09bc89fe6769206ac5d2d2c1e2648478
2020-04-17 04:22:44 +00:00
Tom Hsu
a733ead043
Merge "Fix failures on com.android.settings.network.ApnEditorTest" into rvc-dev am: 7c84dc9959
...
Change-Id: Ifd84da0751b08efa551bcde8a3d7a2c21b2e4f20
2020-04-17 04:22:28 +00:00
Tom Hsu
7c84dc9959
Merge "Fix failures on com.android.settings.network.ApnEditorTest" into rvc-dev
2020-04-17 04:01:10 +00:00
Zhen Zhang
9227cb4bca
Merge "[Settings] Fix crashes caused by null bluetooth adapter and ethernet manager" into rvc-dev am: 7e3e5dfa06 am: 987a70e750 am: 1963474117 am: 9c690ed79e am: 1b310b4b15
...
Change-Id: Ida6352079d85de150d30902f9cdd6c4abbcb9d76
2020-04-17 03:52:20 +00:00
Zhen Zhang
1b310b4b15
Merge "[Settings] Fix crashes caused by null bluetooth adapter and ethernet manager" into rvc-dev am: 7e3e5dfa06 am: 987a70e750 am: 1963474117 am: 9c690ed79e
...
Change-Id: I7fd91cfe8025d06a0a0ea0d10f40cc0f0db52b15
2020-04-17 03:52:07 +00:00
Zhen Zhang
b869c52409
Merge "[Settings] Fix crashes caused by null bluetooth adapter and ethernet manager" into rvc-dev am: 7e3e5dfa06 am: 5d6960e996 am: 5f179b8e14 am: 5af8e27a28
...
Change-Id: I1c1bd10b1bfd6181d0546b9c8dc9df1b82cf5b08
2020-04-17 03:52:07 +00:00
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
5af8e27a28
Merge "[Settings] Fix crashes caused by null bluetooth adapter and ethernet manager" into rvc-dev am: 7e3e5dfa06 am: 5d6960e996 am: 5f179b8e14
...
Change-Id: I8bf26c80d45e3e319832717273db0dc1712b8036
2020-04-17 03:38:42 +00:00
Zhen Zhang
9c690ed79e
Merge "[Settings] Fix crashes caused by null bluetooth adapter and ethernet manager" into rvc-dev am: 7e3e5dfa06 am: 987a70e750 am: 1963474117
...
Change-Id: Ie8f192c76ae04321994ce1e3c66f2089cceac6f0
2020-04-17 03:38:32 +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
5f179b8e14
Merge "[Settings] Fix crashes caused by null bluetooth adapter and ethernet manager" into rvc-dev am: 7e3e5dfa06 am: 5d6960e996
...
Change-Id: I0711968860a05b383801c41d52851b63aab51051
2020-04-17 03:23:06 +00:00
Zhen Zhang
1963474117
Merge "[Settings] Fix crashes caused by null bluetooth adapter and ethernet manager" into rvc-dev am: 7e3e5dfa06 am: 987a70e750
...
Change-Id: I48653122c49815b166b0e3cd3f3db8ce0ff2b05e
2020-04-17 03:22:58 +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
5d6960e996
Merge "[Settings] Fix crashes caused by null bluetooth adapter and ethernet manager" into rvc-dev am: 7e3e5dfa06
...
Change-Id: Icf8bd0a19597127e27b6b736123143dc431fbabf
2020-04-17 03:05:33 +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
