OSDN Git Service
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
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
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"
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
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."
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
Benedict Wong [Fri, 16 Feb 2018 20:28:18 +0000 (20:28 +0000)]
Merge "Correct bug in IpSecTransformTest"
am:
999d1fc172
Change-Id: If99a991052a821f43b8238a47d0d2c7e00362bc3
Treehugger Robot [Fri, 16 Feb 2018 20:02:26 +0000 (20:02 +0000)]
Merge "[DO NOT MERGE] Fix some mouse + list-item selection/scrolling issues"
Treehugger Robot [Fri, 16 Feb 2018 19:54:26 +0000 (19:54 +0000)]
Merge "[DO NOT MERGE] Fix context menu position for RTL"
Robert Sesek [Mon, 12 Feb 2018 23:46:01 +0000 (18:46 -0500)]
Add Zygote.startChildZygote() to fork a new process that itself is a zygote.
This adds a new --start-child-zygote argument that instructs the main
zygote to create a new child process that will also be a zygote. The
system_server generates a random name in the abstract socket namespace
for it and the child-zygote to communicate over, and that is passed as
an argument to the new process.
A child-zygote bypasses the normal post-fork-child of the zygote process
in order to preserve itself as a zygote. This means not starting the
Binder threadpool nor launching into ActivityThread. Instead, a
child-zygote calls into its own main function. The main function runs a
ZygoteServer select loop, listening on the socket name specified by the
system_server when it was forked.
Unlike the system zygotes, a child-zygote can be killed without bringing
down the system. Killing a child-zygote will not terminate its child
processes, which will be reparented to init for reaping when they
eventually exit.
Bug:
63749735
Test: m (with multi-project commits landed)
Change-Id: I3e7ebbdba498f8fec1d84cdf927dc43a92be4b68
Benedict Wong [Fri, 16 Feb 2018 18:32:05 +0000 (18:32 +0000)]
Merge "Correct bug in IpSecTransformTest"
Andreas Gampe [Fri, 16 Feb 2018 17:57:14 +0000 (17:57 +0000)]
Merge "Framework: Disable [MissingOverride] for platformprotos" am:
4eaa22f24e
am:
1c14209950
Change-Id: Ib664802f2a8673ba0d1504a9b93f764ae993b044
Bruno Martins [Fri, 16 Feb 2018 17:50:09 +0000 (17:50 +0000)]
Merge "BluetoothTile: Avoid NPE during boot up phase" am:
977bcea1f0
am:
a1f96ff00e
Change-Id: Id61a5fe96c065377916a630da4842bd675c8ab14
Andreas Gampe [Fri, 16 Feb 2018 17:46:08 +0000 (17:46 +0000)]
Merge "Framework: Disable [MissingOverride] for platformprotos"
am:
4eaa22f24e
Change-Id: I376b8bea0e1c57a6f7e78970bc919d05d1ed372d
Bruno Martins [Fri, 16 Feb 2018 17:41:30 +0000 (17:41 +0000)]
Merge "BluetoothTile: Avoid NPE during boot up phase"
am:
977bcea1f0
Change-Id: I692e2c21f92d0e8eff5c9114e012cd90e84f31e9
Mathew Inwood [Fri, 16 Feb 2018 16:39:59 +0000 (16:39 +0000)]
Merge "Hidden API blacklisting killswitch." am:
46656fa28e
am:
84259cea59
Change-Id: Ia0bcbfb2cdc84a6a8a82f82ecda82f46ba46dab1
Mathew Inwood [Fri, 16 Feb 2018 16:31:26 +0000 (16:31 +0000)]
Merge "Hidden API blacklisting killswitch."
am:
46656fa28e
Change-Id: I1276e1eb5b2d4438ebc6f071ed28f1f322a8bc6e
Treehugger Robot [Fri, 16 Feb 2018 16:05:19 +0000 (16:05 +0000)]
Merge "Framework: Disable [MissingOverride] for platformprotos"
Paul Duffin [Fri, 16 Feb 2018 13:11:05 +0000 (13:11 +0000)]
Turn on DepAnn for test-base and test-runner
Bug:
30188076
Test: m -j20 RUN_ERROR_PRONE=true android.test.base android.test.runner
Change-Id: I735e3fbfcc710f1dc1b96e04f91b9feda8727b6c
Treehugger Robot [Fri, 16 Feb 2018 15:20:23 +0000 (15:20 +0000)]
Merge "BluetoothTile: Avoid NPE during boot up phase"
Treehugger Robot [Fri, 16 Feb 2018 11:50:20 +0000 (11:50 +0000)]
Merge "Hidden API blacklisting killswitch."
Mathew Inwood [Thu, 15 Feb 2018 10:28:06 +0000 (10:28 +0000)]
Hidden API blacklisting killswitch.
Just support "*" for now, meaning disable all API blacklisting for all
apps.
Test: Manually verified by:
- installing test app that accesses hidden API
- manually blacklist the API
- $ adb shell settings put global hidden_api_blacklist_exemptions \\*
This is a cherry pick of change I9a41a104742c9aaaf3a753e7b0f3a1106e37d4d3
from internal master.
Merged-In: I9a41a104742c9aaaf3a753e7b0f3a1106e37d4d3
Change-Id: Ibb2a1d054c1b099fc6093e37f24b2ed421a2313c
Chalard Jean [Fri, 16 Feb 2018 07:07:53 +0000 (16:07 +0900)]
[LT1] Add a test for release request while lingering
Test: runtest framework-net
Change-Id: Ic635f97bf3dad8b695b3b8cc32c1a8b891166f9f
Chalard Jean [Fri, 16 Feb 2018 08:59:29 +0000 (17:59 +0900)]
Don't refcount TRACK_DEFAULT requests.
This has no concrete impact on the behavior of ConnectivityService,
but in principle TRACK_DEFAULT requests should not be counted toward
requests that make a network foreground. It does not have an impact
because only VPNs could be affected by this, and VPNs are always in
the foreground by definition.
Test: runtest frameworks-net
Test: cts
Change-Id: Id2ae6b5c9d542fe168e64ed713b6ec0a04062c82
Chalard Jean [Fri, 16 Feb 2018 08:21:39 +0000 (17:21 +0900)]
DO NOT MERGE : fix useless import
This was added to avoid a merge conflict at a sensitive time.
It can (and should) go.
Test: no code change
Change-Id: I11d73e2d988ae61a168aa0f1cc7c2c506f509d30
Hugo Benichi [Fri, 16 Feb 2018 07:50:57 +0000 (07:50 +0000)]
Merge "Add missing'}' in javadoc of public API method" am:
f50d9fbdc1
am:
054bed5968
Change-Id: I51ad1f6b8d42f4c791c07d41297f02d3e798ccd9
Hugo Benichi [Fri, 16 Feb 2018 07:43:08 +0000 (07:43 +0000)]
Merge "Add missing'}' in javadoc of public API method"
am:
f50d9fbdc1
Change-Id: I3afcd9a3752ff6d158d68ca3ce19272151c1908c
Calin Juravle [Fri, 16 Feb 2018 05:45:10 +0000 (05:45 +0000)]
Merge "Pass the compilation reason to dexopt" am:
b0817b238a
am:
68024999b7
Change-Id: I6a4e3dd19cf612bd698bff0f60de2ef3fac35604
Calin Juravle [Fri, 16 Feb 2018 05:34:41 +0000 (05:34 +0000)]
Merge "Pass the compilation reason to dexopt"
am:
b0817b238a
Change-Id: Id8b60a2963b35a44c9420d9846283091b5e0619e
Nathan Harold [Fri, 16 Feb 2018 03:19:43 +0000 (03:19 +0000)]
Merge "Fix LTE Timing Advance Doc String" am:
3df127aefe
am:
c52bec3acb
Change-Id: I352f5d1e72b48d7a4944b0f0935fe03d4c5979c1
Treehugger Robot [Fri, 16 Feb 2018 03:19:35 +0000 (03:19 +0000)]
Merge "Add missing'}' in javadoc of public API method"
Bruno Martins [Fri, 16 Feb 2018 03:14:38 +0000 (03:14 +0000)]
Merge "NfcTile: Avoid NPE during boot up phase" am:
3a419fe212
am:
3628537476
Change-Id: I383b289d734ed72f248e004c8767357aca2ac578
Nathan Harold [Fri, 16 Feb 2018 03:05:49 +0000 (03:05 +0000)]
Merge "Fix LTE Timing Advance Doc String"
am:
3df127aefe
Change-Id: I3dfbe863080d3a5aadb01e77cd5a28861045b696
Bruno Martins [Fri, 16 Feb 2018 03:01:36 +0000 (03:01 +0000)]
Merge "NfcTile: Avoid NPE during boot up phase"
am:
3a419fe212
Change-Id: I352028c1974c38f2a88ffb6bdc49da7bd28d2204
Benedict Wong [Fri, 16 Feb 2018 02:47:49 +0000 (18:47 -0800)]
Correct bug in IpSecTransformTest
testCreateTransformsWithSameConfigEqual used assertFalse rather than
assertTrue
Bug:
69385347
Test: Passing on walleye
Change-Id: I8caa26e184e8bfc3e8acc9061d85c22d27ebf448
Calin Juravle [Fri, 16 Feb 2018 02:25:48 +0000 (02:25 +0000)]
Merge "Pass the compilation reason to dexopt"
Dan Zhang [Fri, 16 Feb 2018 02:21:04 +0000 (02:21 +0000)]
Merge "Fix HdmiCecLocalDevice concurrent access" am:
549082991d
am:
1494c01109
Change-Id: I74f59f35e1d78bdd9dcef57a939ec7a7af625049
Dan Zhang [Fri, 16 Feb 2018 02:07:15 +0000 (02:07 +0000)]
Merge "Fix HdmiCecLocalDevice concurrent access"
am:
549082991d
Change-Id: I86dba1aa8ee360d5f813d3108902d6affd74b13f
Bruno Martins [Fri, 16 Feb 2018 01:52:44 +0000 (01:52 +0000)]
Merge "DndTile: Avoid NPE during boot phase" am:
e134d23a7a
am:
fe607c0e2b
Change-Id: I58e63317a1c842e49a072507565c546789bb01ad
Treehugger Robot [Fri, 16 Feb 2018 01:47:27 +0000 (01:47 +0000)]
Merge "Fix LTE Timing Advance Doc String"
Hall Liu [Fri, 16 Feb 2018 01:47:27 +0000 (01:47 +0000)]
Merge "Un-hide Connection-side RTT APIs for Dialer" am:
d35e81d615
am:
01ae6fc2cd
Change-Id: Iaaf10ec63261a38f928dca9e8d91c9ab3e74ae34
Bruno Martins [Fri, 16 Feb 2018 01:40:50 +0000 (01:40 +0000)]
Merge "DndTile: Avoid NPE during boot phase"
am:
e134d23a7a
Change-Id: Iff3b41e08abc89956b924b40b6d72bf79a294eb0
Hall Liu [Fri, 16 Feb 2018 01:37:01 +0000 (01:37 +0000)]
Merge "Un-hide Connection-side RTT APIs for Dialer"
am:
d35e81d615
Change-Id: I2da7e7766d131500167f745cc50ae882edc832cf
Treehugger Robot [Fri, 16 Feb 2018 01:34:43 +0000 (01:34 +0000)]
Merge "NfcTile: Avoid NPE during boot up phase"
OSDN Git Service
