OSDN Git Service
Hall Liu [Thu, 22 Feb 2018 00:34:03 +0000 (00:34 +0000)]
Merge "Check for location access on TelephonyRegistry" am:
31230bb193
am:
f581580fdb
Change-Id: Ic13eacf7dafc96359bd607cb4e2a5c024f9bb607
Chris Tate [Thu, 22 Feb 2018 00:16:40 +0000 (00:16 +0000)]
Merge "Explicitly restart the killed wallpaper service" am:
0780b18a9f
am:
9298af376a
Change-Id: If3cd3217c2d9f42772e0f276c1bc3c1380ac149f
Hall Liu [Thu, 22 Feb 2018 00:11:04 +0000 (00:11 +0000)]
Merge "Check for location access on TelephonyRegistry"
am:
31230bb193
Change-Id: I6827b337d9bcc2c634d873e03895c5997cca374c
Chris Tate [Thu, 22 Feb 2018 00:06:25 +0000 (00:06 +0000)]
Merge "Explicitly restart the killed wallpaper service"
am:
0780b18a9f
Change-Id: I7759fc380ef9555cb58f9ab593248e69cd798c70
Xiangyu/Malcolm Chen [Wed, 21 Feb 2018 23:15:30 +0000 (23:15 +0000)]
Merge "Fix low probability deadlock" am:
bb5cbc539f
am:
e05aa02d59
Change-Id: I3560bd28b67fee381f6c2d9e8bc8864efe63090d
Xiangyu/Malcolm Chen [Wed, 21 Feb 2018 23:01:42 +0000 (23:01 +0000)]
Merge "Fix low probability deadlock"
am:
bb5cbc539f
Change-Id: Ife7dd96618b75fd492aaf0397870653d63cf0d5e
Hall Liu [Wed, 21 Feb 2018 22:42:08 +0000 (22:42 +0000)]
Merge "Check for location access on TelephonyRegistry"
Chris Tate [Wed, 21 Feb 2018 21:49:31 +0000 (21:49 +0000)]
Merge "Explicitly restart the killed wallpaper service"
Xiangyu/Malcolm Chen [Wed, 21 Feb 2018 21:16:44 +0000 (21:16 +0000)]
Merge "Fix low probability deadlock"
yifan.bai [Fri, 22 Dec 2017 06:59:57 +0000 (14:59 +0800)]
Fix low probability deadlock
Low probability deadlock in com.android.phone and system_server.
Bug:
70865607
Test: Build pass
Robert Sesek [Wed, 21 Feb 2018 02:33:14 +0000 (02:33 +0000)]
Merge "Reparent the webview_zygote to be a child of the main app_process zygote." am:
1c81aa6375
am:
486190f87b
Change-Id: I683dbbf730bfd02e43cb67bfcaa0df56d69c9796
Robert Sesek [Wed, 21 Feb 2018 02:16:22 +0000 (02:16 +0000)]
Merge "Reparent the webview_zygote to be a child of the main app_process zygote."
am:
1c81aa6375
Change-Id: I2af77c52ea7aca058ab1a1fc224968760e6c3ac5
Treehugger Robot [Wed, 21 Feb 2018 00:43:56 +0000 (00:43 +0000)]
Merge "Reparent the webview_zygote to be a child of the main app_process zygote."
Torne (Richard Coles) [Wed, 21 Feb 2018 00:17:22 +0000 (00:17 +0000)]
Merge "Consider shared libs when precreating WebView classloader." am:
f9fd8dfcc0
am:
424f3ab432
Change-Id: I21f031e97f750b8837eb9c698005fd3f112631ca
Torne (Richard Coles) [Wed, 21 Feb 2018 00:03:58 +0000 (00:03 +0000)]
Merge "Consider shared libs when precreating WebView classloader."
am:
f9fd8dfcc0
Change-Id: I2e326ffb47a95c01bf5e67320bbf8aa8193916af
Brad Ebinger [Tue, 20 Feb 2018 23:20:48 +0000 (23:20 +0000)]
Merge "Add new reason code for call failed by unobtainable number" am:
4122fd23dc
am:
ffe0e51f47
Change-Id: I9b706c18b2d184b303adb526ee7adf86dd7e9ee9
Pankaj Kanwar [Tue, 20 Feb 2018 23:13:33 +0000 (23:13 +0000)]
Merge "Change KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL to false" am:
8343a47035
am:
de9585fe28
Change-Id: I11bcc2948e8efeea731299c5b8d642e155c1a2d5
nharold [Tue, 20 Feb 2018 23:07:53 +0000 (23:07 +0000)]
Merge "Fix ConnectivityServiceTest for NATT Keepalive" am:
6d5aea8811
am:
ad96984eb5
Change-Id: I3c28cbb55f8226776792df9cacf1b5e527389157
Brad Ebinger [Tue, 20 Feb 2018 23:02:55 +0000 (23:02 +0000)]
Merge "Add new reason code for call failed by unobtainable number"
am:
4122fd23dc
Change-Id: Ib390ec02187fd27687dddc334bf2fcc791012c8e
Pankaj Kanwar [Tue, 20 Feb 2018 22:57:52 +0000 (22:57 +0000)]
Merge "Change KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL to false"
am:
8343a47035
Change-Id: I4940e0ba4e86db861c75e910329aaf8fadd0e7e1
nharold [Tue, 20 Feb 2018 22:55:38 +0000 (22:55 +0000)]
Merge "Fix ConnectivityServiceTest for NATT Keepalive"
am:
6d5aea8811
Change-Id: Idbdffc7bbd2d9a96f6e6052810722df04a20a65c
Robert Sesek [Wed, 17 Jan 2018 23:48:18 +0000 (18:48 -0500)]
Reparent the webview_zygote to be a child of the main app_process zygote.
This uses the new ZygoteProcess.startChildZygote() method to launch the
webview_zygote, rather than having init start it. This will share more
memory between the app_process and the webview_zygote, reducing the
overall system footprint.
Bug:
63749735
Test: m
Test: Launch "Third-party licenses" activity from Settings, and it
renders correctly via the WebView.
Change-Id: I3e39cd8adb9c099c92ee34640428916d90cb2b8f
Treehugger Robot [Tue, 20 Feb 2018 21:59:54 +0000 (21:59 +0000)]
Merge "Consider shared libs when precreating WebView classloader."
Brad Ebinger [Tue, 20 Feb 2018 21:00:08 +0000 (21:00 +0000)]
Merge "Add new reason code for call failed by unobtainable number"
Pankaj Kanwar [Tue, 20 Feb 2018 20:48:12 +0000 (20:48 +0000)]
Merge "Change KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL to false"
Torne (Richard Coles) [Tue, 19 Sep 2017 19:21:29 +0000 (15:21 -0400)]
Consider shared libs when precreating WebView classloader.
The change to handling of the deprecated Apache HTTP library means that
the WebView implementation package might have a non-empty shared library
list. Make sure to fetch shared libraries when querying WebView
implementations, and take them into account when constructing both the
actual classpath to be used to precreate the classloader, and when
deciding what the cache key for the precreated classloader should be.
Change-Id: I5e1409358d935e1c9f325db434bc6d4ef8ead759
Merged-In: I5e1409358d935e1c9f325db434bc6d4ef8ead759
Fixes:
65574359
Test: launch anything that uses WebView
(cherry picked from commit
4fd8aa51e4de5a7c93841571e30ff10077d1b125)
Mathieu Chartier [Tue, 20 Feb 2018 20:40:00 +0000 (20:40 +0000)]
Merge "Pass DEXOPT_INSTALL_WITH_DEX_METADATA_FILE for first boot" am:
0ea144f4bf
am:
8deca3f06f
Change-Id: Idefc228d35212f4014e9bb204e54b58c904ee94c
Bruno Martins [Tue, 20 Feb 2018 20:34:09 +0000 (20:34 +0000)]
Merge "WifiTile: Avoid NPE during boot phase" am:
b23150ffa9
am:
0d90a0690b
Change-Id: I65e814b392cc0891f970223c2ded27c7420205dc
Mathieu Chartier [Tue, 20 Feb 2018 20:26:00 +0000 (20:26 +0000)]
Merge "Pass DEXOPT_INSTALL_WITH_DEX_METADATA_FILE for first boot"
am:
0ea144f4bf
Change-Id: Icdd5128db27b701e76656f1e3e5ae230dbd15daa
Bruno Martins [Tue, 20 Feb 2018 20:20:51 +0000 (20:20 +0000)]
Merge "WifiTile: Avoid NPE during boot phase"
am:
b23150ffa9
Change-Id: Ib4748cb4814e4f6f1c5e7579284522ac55df329f
nharold [Tue, 20 Feb 2018 19:17:23 +0000 (19:17 +0000)]
Merge "Fix ConnectivityServiceTest for NATT Keepalive"
Mathieu Chartier [Tue, 20 Feb 2018 19:12:38 +0000 (19:12 +0000)]
Merge "Pass DEXOPT_INSTALL_WITH_DEX_METADATA_FILE for first boot"
Bill Yi [Tue, 20 Feb 2018 18:14:20 +0000 (18:14 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
646773f4ef -s ours
Change-Id: If7c5be44c3912e481e85103c0b6bc9f11f08381a
TreeHugger Robot [Tue, 20 Feb 2018 18:01:54 +0000 (18:01 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
David Brazdil [Tue, 20 Feb 2018 16:08:41 +0000 (16:08 +0000)]
Merge "Add flag to AMS.startInstrumentation() to disable hidden API checks" am:
4a8fa52e4b
am:
b459c66fca
Change-Id: Ic9aac96f55b4eb947b5af78a6b8482638a806ae5
David Brazdil [Tue, 20 Feb 2018 15:54:28 +0000 (15:54 +0000)]
Merge "Add flag to AMS.startInstrumentation() to disable hidden API checks"
am:
4a8fa52e4b
Change-Id: Ie94241b7b44a98fea1753f7aa58475384cb33800
Treehugger Robot [Tue, 20 Feb 2018 15:23:04 +0000 (15:23 +0000)]
Merge "WifiTile: Avoid NPE during boot phase"
David Brazdil [Tue, 20 Feb 2018 14:36:18 +0000 (14:36 +0000)]
Merge "Add flag to AMS.startInstrumentation() to disable hidden API checks"
Bill Yi [Tue, 20 Feb 2018 07:47:19 +0000 (07:47 +0000)]
Merge changes from topic "am-
b69199ef-52eb-434d-a231-
8cb19da641fc" into oc-dev am:
a1f536e00e am:
ff1a55a207
am:
7252081be1
Change-Id: I3ab38999b143631c39cd25a2e21b4d6ad766a486
Bill Yi [Tue, 20 Feb 2018 07:41:05 +0000 (07:41 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
4c87ffeae2 skipped:
2aaa34b639 am:
7b73069b0a -s ours am:
6f40fc77e6 -s ours
am:
a3f97b668e -s ours
Change-Id: I5da2857e1fd4ea8db5053d5658b3b07c00f05fd0
Bill Yi [Tue, 20 Feb 2018 05:39:40 +0000 (21:39 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I2f3e741047207c9948bbda977800e4a10b5797c1
Bill Yi [Tue, 20 Feb 2018 05:26:01 +0000 (05:26 +0000)]
Merge changes from topic "am-
8dbc037c-490f-442d-957b-
fea681fe1136" into oc-dev am:
dd05e2d932 am:
ea5b2a818d
am:
5b8e6195a0
Change-Id: I34e8850eaa89f769957fa5b17f4d5cc823871292
Bill Yi [Tue, 20 Feb 2018 05:25:11 +0000 (05:25 +0000)]
Merge changes from topic "am-
b69199ef-52eb-434d-a231-
8cb19da641fc" into oc-dev am:
a1f536e00e
am:
ff1a55a207
Change-Id: Ibcd4efc7c50a91c6dd401436a2d82171793e0e6b
Bill Yi [Tue, 20 Feb 2018 05:19:47 +0000 (05:19 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
4c87ffeae2 skipped:
2aaa34b639 am:
7b73069b0a -s ours
am:
6f40fc77e6 -s ours
Change-Id: I9f0d46d5dcd235ab83f52cfe6b21ad780d8404c5
Bill Yi [Tue, 20 Feb 2018 05:19:44 +0000 (05:19 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
fb5d1738dd skipped:
0b7e5c37cc am:
023ae30cdd -s ours am:
16e78b6dc1 -s ours
am:
e16f27b3fc -s ours
Change-Id: Ib6702b93752a79c08d16bf5035435f14b7e0c350
Bill Yi [Tue, 20 Feb 2018 05:13:43 +0000 (05:13 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
a4513689c8 skipped:
baff683653 am:
42e8a0c2de -s ours am:
da0d89bf92 -s ours
am:
f81de61e4e -s ours
Change-Id: I37cf66df3213345c876db85f399dfb7c82f917bb
Bill Yi [Tue, 20 Feb 2018 05:12:59 +0000 (05:12 +0000)]
Merge changes from topic "am-
8dbc037c-490f-442d-957b-
fea681fe1136" into oc-dev am:
dd05e2d932
am:
ea5b2a818d
Change-Id: I824e17d5fcf0fcd7865d151a7d32b4991f045399
Bill Yi [Tue, 20 Feb 2018 05:09:31 +0000 (05:09 +0000)]
Merge changes from topic "am-
b69199ef-52eb-434d-a231-
8cb19da641fc" into oc-dev
am:
a1f536e00e
Change-Id: Ic19ff34e840d35ea8e93305b8b323c9bdb81b058
Bill Yi [Tue, 20 Feb 2018 05:08:15 +0000 (05:08 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
4c87ffeae2 skipped:
2aaa34b639
am:
7b73069b0a -s ours
Change-Id: I93eef5aeb3e029a70f602c145604a3320c219ddf
Bill Yi [Tue, 20 Feb 2018 05:08:10 +0000 (05:08 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
fb5d1738dd skipped:
0b7e5c37cc am:
023ae30cdd -s ours
am:
16e78b6dc1 -s ours
Change-Id: I67ed476e1375dba6a1c5864f561498c9e259c052
Bill Yi [Tue, 20 Feb 2018 05:03:09 +0000 (05:03 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
a4513689c8 skipped:
baff683653 am:
42e8a0c2de -s ours
am:
da0d89bf92 -s ours
Change-Id: I76ad6438afad284c3eed8d4a86111870865a7253
Bill Yi [Tue, 20 Feb 2018 05:02:56 +0000 (05:02 +0000)]
Merge changes from topic "am-
8dbc037c-490f-442d-957b-
fea681fe1136" into oc-dev
am:
dd05e2d932
Change-Id: I149351dee948b64a4ee4de1512ea98d7692afdf6
Bill Yi [Tue, 20 Feb 2018 05:01:34 +0000 (05:01 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
fb5d1738dd skipped:
0b7e5c37cc
am:
023ae30cdd -s ours
Change-Id: Id625fa8ab91f53283f0e5985f13141e54d2dfe8e
Bill Yi [Tue, 20 Feb 2018 04:56:46 +0000 (04:56 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
a4513689c8 skipped:
baff683653
am:
42e8a0c2de -s ours
Change-Id: I21df47ac8511c2003fa9dd0c07065cb8f7cb8b28
TreeHugger Robot [Tue, 20 Feb 2018 04:54:20 +0000 (04:54 +0000)]
Merge changes from topic "am-
b69199ef-52eb-434d-a231-
8cb19da641fc" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
4c87ffeae2 skipped:
2aaa34b639
[automerger skipped] Import translations. DO NOT MERGE skipped:
4c87ffeae2
Import translations. DO NOT MERGE
TreeHugger Robot [Tue, 20 Feb 2018 04:53:51 +0000 (04:53 +0000)]
Merge changes from topic "am-
8dbc037c-490f-442d-957b-
fea681fe1136" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped:
fb5d1738dd skipped:
0b7e5c37cc
[automerger skipped] Import translations. DO NOT MERGE skipped:
fb5d1738dd
Import translations. DO NOT MERGE
pkanwar [Mon, 19 Feb 2018 18:33:33 +0000 (10:33 -0800)]
Change KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL to false
Bug:
73609752
Test: compile
Change-Id: Ie9615e63d136f40ee301504b3e2b3b7ea4aec129
Android Build Merger (Role) [Mon, 19 Feb 2018 17:17:18 +0000 (17:17 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
fb5d1738dd skipped:
0b7e5c37cc
Change-Id: Ie880a7487ed875a62e4fab4974da4a35d3c6b8b4
Android Build Merger (Role) [Mon, 19 Feb 2018 17:17:12 +0000 (17:17 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
fb5d1738dd
Change-Id: I70b8b1c9fab0c7ae88a9a5f839ee411b28fd4f19
Bill Yi [Mon, 19 Feb 2018 17:16:47 +0000 (09:16 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2e31731c8393cbcd58b57cc4092d14626e60af8b
Auto-generated-cl: translation import
Paul Duffin [Mon, 19 Feb 2018 16:34:08 +0000 (16:34 +0000)]
Merge "Turn on DepAnn for test-base and test-runner" am:
8dbbc3543e
am:
38a916fb74
Change-Id: I6508127afc4434f33533c2dd13db17db092e9788
Paul Duffin [Mon, 19 Feb 2018 16:24:57 +0000 (16:24 +0000)]
Merge "Turn on DepAnn for test-base and test-runner"
am:
8dbbc3543e
Change-Id: Ia6fe0967f92b382042326c288d175c4f60b63190
Android Build Merger (Role) [Mon, 19 Feb 2018 16:08:26 +0000 (16:08 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
a4513689c8 skipped:
baff683653
Change-Id: Ie898f10574d4deb9d465e70803b1b6f24e69e867
Android Build Merger (Role) [Mon, 19 Feb 2018 16:08:19 +0000 (16:08 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
a4513689c8
Change-Id: Ib38e6fcc936beb2c72afb46b6e302b4ca261ce14
Bill Yi [Mon, 19 Feb 2018 16:07:44 +0000 (08:07 -0800)]
Import translations. DO NOT MERGE
Change-Id: I1b9d68a390483f6259a7eb05a2e337af617896b6
Auto-generated-cl: translation import
David Brazdil [Mon, 19 Feb 2018 15:39:15 +0000 (15:39 +0000)]
Add flag to AMS.startInstrumentation() to disable hidden API checks
Some tests need to use hidden APIs to check the internal state of
the framework. For those special use cases, we add a new flag to
ActivityManagerService.startInstrumentation that enables to start
instrumented processes without hidden API enforcement. Individual
test harnesses can change their Am command to request the exemption.
Bug:
64382372
Test: adb shell am instrument --no-hidden-api-checks <component>
adb logcat | grep 'Accessing hidden'
Merged-In: I1d734a95423fae90dae63ff09d5f606495830905
Change-Id: Ifbb0d19d95737a9f601b11e20352cdc11f0ca5b6
Android Build Merger (Role) [Mon, 19 Feb 2018 15:09:11 +0000 (15:09 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
4c87ffeae2 skipped:
2aaa34b639
Change-Id: I0ed2f3e40aeaaff5acfbbef02155450747169397
Android Build Merger (Role) [Mon, 19 Feb 2018 15:09:03 +0000 (15:09 +0000)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
4c87ffeae2
Change-Id: I89781e9b815f8fdee167b1427aec4dee233f5530
Bill Yi [Mon, 19 Feb 2018 15:08:29 +0000 (07:08 -0800)]
Import translations. DO NOT MERGE
Change-Id: I6076b206d8c838472c2c958d521ece8038e10206
Auto-generated-cl: translation import
Paul Duffin [Mon, 19 Feb 2018 13:03:56 +0000 (13:03 +0000)]
Merge "Turn on DepAnn for test-base and test-runner"
haoyu li [Wed, 22 Nov 2017 03:49:49 +0000 (12:49 +0900)]
Add new reason code for call failed by unobtainable number
To show the "Invalid number" on the end call screen when user makes a
IMS call with unobtainable number, this reason code is used.
Test: manual - Checked that "Invalid number" is shown when make the IMS
MO call to unobtainable number.
Bug:
69940434
Change-Id: If3c54e6f55850141efad56ad7712db3c82a14f43
Chalard Jean [Mon, 19 Feb 2018 08:24:47 +0000 (08:24 +0000)]
Merge changes Ic28c5653,Ic635f97b am:
1ea3d9411a
am:
27dbc898dc
Change-Id: I6596fae1946bffade125a14b3bd095eda557a7a5
Chalard Jean [Mon, 19 Feb 2018 08:14:19 +0000 (08:14 +0000)]
Merge changes Ic28c5653,Ic635f97b
am:
1ea3d9411a
Change-Id: I38218d8652ec36f2ea076a6806df883a9c9636de
Tetsutoki Shiozawa [Fri, 2 Feb 2018 05:18:43 +0000 (14:18 +0900)]
Explicitly restart the killed wallpaper service
Symptom:
Live wallpaper setting was reset when a wallpaper service was killed
by Lmk. The wallpaper fell back to the default image wallpaper. It's
a black bitmap.
Root cause:
When restarting wallpaper service takes more than 10 seconds, it's
treated as a bad wallpaper. The wallpaper setting is reset to remove
the bad wallpaper.
This is not a suitable solution under the low memory situation.
Multiple processes are killed by Lmk at one time. Killed services are
automatically restarted by AMS with a few seconds interval.
The restart interval is increased by a factor of the number of killed
services. Sometimes, it takes more than 1 minute.
Solution:
When a wallpaper service is killed, WallpaperManagerService requests
restarting the service immediately. It can ignore the restart interval.
Bug:
73071020
Change-Id: Id5bb1cf121029a513f8773597f296b47667d1e21
Chalard Jean [Mon, 19 Feb 2018 04:01:17 +0000 (04:01 +0000)]
Merge "Don't refcount TRACK_DEFAULT requests." am:
114278c9eb
am:
a6f193162a
Change-Id: Ib3e0e89a9d80546fbf3555cfdf715f2bd8e4ab94
Chalard Jean [Mon, 19 Feb 2018 03:54:25 +0000 (03:54 +0000)]
Merge "Don't refcount TRACK_DEFAULT requests."
am:
114278c9eb
Change-Id: I094ad8f9764f5cd657e2fe98c846710c8d241b64
Treehugger Robot [Mon, 19 Feb 2018 03:45:27 +0000 (03:45 +0000)]
Merge changes Ic28c5653,Ic635f97b
* changes:
[LT2] Fix release request while lingering.
[LT1] Add a test for release request while lingering
Chalard Jean [Mon, 19 Feb 2018 02:13:48 +0000 (02:13 +0000)]
Merge "Don't refcount TRACK_DEFAULT requests."
Chalard Jean [Fri, 16 Feb 2018 07:08:35 +0000 (16:08 +0900)]
[LT2] Fix release request while lingering.
Test: runtest framework-net
Change-Id: Ic28c5653d16351903b792e76ba8b199b7ed1f8d4
Chalard Jean [Mon, 19 Feb 2018 01:57:09 +0000 (01:57 +0000)]
Merge "DO NOT MERGE : fix useless import" am:
473b3b7f03 -s ours
am:
b68ce4b33e -s ours
Change-Id: I75fc8e73f448ffee44a28149843c1d08399e255e
Chalard Jean [Mon, 19 Feb 2018 01:51:39 +0000 (01:51 +0000)]
Merge "DO NOT MERGE : fix useless import"
am:
473b3b7f03 -s ours
Change-Id: Ic717c478266a317fab1c618bc2a894e6610ffdd4
Chalard Jean [Sun, 18 Feb 2018 23:14:42 +0000 (23:14 +0000)]
Merge "DO NOT MERGE : fix useless import"
Bill Yi [Sun, 18 Feb 2018 17:12:57 +0000 (17:12 +0000)]
Import translations. DO NOT MERGE
am:
2604d97ab6 -s ours
Change-Id: I0b5e8523e8e43ce3fd58c14e9be9423b1e58c2a6
Scott Kennedy [Sat, 17 Feb 2018 07:58:31 +0000 (07:58 +0000)]
Merge "Add @Nullable to return values in Uri" am:
cfc6897a39
am:
a03c35d74a
Change-Id: Ia145a065eabe75e72051287005cd5ab341fe2824
Scott Kennedy [Sat, 17 Feb 2018 07:45:37 +0000 (07:45 +0000)]
Merge "Add @Nullable to return values in Uri"
am:
cfc6897a39
Change-Id: I109bd5952643598c5306ab27debb4dd2b30fffed
Treehugger Robot [Sat, 17 Feb 2018 04:49:23 +0000 (04:49 +0000)]
Merge "Add @Nullable to return values in Uri"
Bill Yi [Sat, 17 Feb 2018 04:01:02 +0000 (20:01 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I54b1c06d488c0fdae78a4aec9629b6bcc9db9f07
Robert Sesek [Sat, 17 Feb 2018 03:51:28 +0000 (03:51 +0000)]
Merge "Add Zygote.startChildZygote() to fork a new process that itself is a zygote." am:
554cfd1f1d
am:
5b9410c74b
Change-Id: I5e9d5c960b9f78cfa7ca7ab88e9d2075f97daca8
Robert Sesek [Sat, 17 Feb 2018 03:41:55 +0000 (03:41 +0000)]
Merge "Add Zygote.startChildZygote() to fork a new process that itself is a zygote."
am:
554cfd1f1d
Change-Id: I723f75be6488390932a60b411ac04660c16d93d1
Treehugger Robot [Sat, 17 Feb 2018 01:39:54 +0000 (01:39 +0000)]
Merge "Add Zygote.startChildZygote() to fork a new process that itself is a zygote."
Nathan Harold [Wed, 14 Feb 2018 21:09:45 +0000 (13:09 -0800)]
Fix ConnectivityServiceTest for NATT Keepalive
Fix test breakages I caused when adding cell
support for NATT keepalives.
-Make the minimum keepalive interval a constant in
ConnectivityManager and use it in tests.
-Re-Disallow IPv6 Keepalives
Bug:
73327535
Test: 'runtest -x ConnectivityServiceTest' now passes
Change-Id: I5ec4367d250ee371014e65c897c3897a25a05e2d
Bruno Martins [Fri, 16 Feb 2018 23:06:06 +0000 (00:06 +0100)]
WifiTile: Avoid NPE during boot phase
* Listening handling can only take place once mController
is properly initialized.
Change-Id: Icd5003e67a725323a5445a936d5a38a3006c5431
Brad Ebinger [Fri, 16 Feb 2018 23:21:41 +0000 (23:21 +0000)]
Merge "MSIM support for hidden IMS capability and registration query APIs." am:
b8d25ed3a4
am:
5cb9aa55e8 -s ours
Change-Id: I9da5571baf210378fd2f0bbd59f3cca04be849af
Brad Ebinger [Fri, 16 Feb 2018 23:09:39 +0000 (23:09 +0000)]
Merge "MSIM support for hidden IMS capability and registration query APIs."
am:
b8d25ed3a4
Change-Id: I1636e80c2f09e8949ba44f7225aed16448ed5692
Evan Rosky [Fri, 16 Feb 2018 21:36:56 +0000 (21:36 +0000)]
Merge "[DO NOT MERGE] Fix some mouse + list-item selection/scrolling issues" am:
8b764a0dab -s ours
am:
d418ecfc66 -s ours
Change-Id: I7d45de823c87f346b25ad0194dc538b560d67bad
Evan Rosky [Fri, 16 Feb 2018 21:25:26 +0000 (21:25 +0000)]
Merge "[DO NOT MERGE] Fix some mouse + list-item selection/scrolling issues"
am:
8b764a0dab -s ours
Change-Id: Iffb3e3c70d9d135f15f66f3bf7968dfef9f1d4f5
Vladislav Kaznacheev [Fri, 16 Feb 2018 20:46:04 +0000 (20:46 +0000)]
Merge "[DO NOT MERGE] Fix context menu position for RTL" am:
80ae7124f5 -s ours
am:
e715e2162e -s ours
Change-Id: I6edeac6d72d6f3471bbfc8f39fec282567441e82
Benedict Wong [Fri, 16 Feb 2018 20:43:12 +0000 (20:43 +0000)]
Merge "Correct bug in IpSecTransformTest" am:
999d1fc172
am:
c9f558d46d
Change-Id: I990729e8592e70898867fe72a3d628fd7f9fdaf0
Brad Ebinger [Fri, 16 Feb 2018 20:35:45 +0000 (20:35 +0000)]
Merge "MSIM support for hidden IMS capability and registration query APIs."
Vladislav Kaznacheev [Fri, 16 Feb 2018 20:31:06 +0000 (20:31 +0000)]
Merge "[DO NOT MERGE] Fix context menu position for RTL"
am:
80ae7124f5 -s ours
Change-Id: If52d9831857624890785c31689d69dd6c0f28e09