Commit Graph

255075 Commits

Author SHA1 Message Date
Tobias Thierer
8fc0ac9b39 Merge "Track libcore update of Map classes to jdk8u60." am: ec6a323da2
am: 17fea8b967

Change-Id: I2b6df8da3c87ec2232b60380cd91c0b4aab7025b
2016-08-17 17:03:44 +00:00
Phil Burk
86fbbfb6f0 Merge "UsbMidiDevice: fix MIDI flush()"
am: c5b376ab66

Change-Id: I20fcf969489fda53e60ad3642f955ae346ec9868
2016-08-17 16:59:06 +00:00
Tobias Thierer
17fea8b967 Merge "Track libcore update of Map classes to jdk8u60."
am: ec6a323da2

Change-Id: I6af9d2929d07cc60be8485de344d335c1bf5cf33
2016-08-17 16:54:30 +00:00
Tobias Thierer
5efe2b7515 Revert "Track libcore update of Map classes to jdk8u60"
am: 7783213611

Change-Id: I10e2130939778adf5fb51fc89404bfb9fc82ce0f
2016-08-17 16:54:08 +00:00
Tobias Thierer
eb4eeb5323 Track libcore update of Map classes to jdk8u60
am: fb2ade3dca

Change-Id: I4ddb3bc3c7428467f8bde073e3ebc7e6b04d899c
2016-08-17 16:54:05 +00:00
Glenn Kasten
1fda533936 Squashed commit of the following:
commit efa6f355b06675aa4d0879fd279e22c16d5c046c
Author: Mikhail Naganov <mnaganov@google.com>
Date:   Wed Aug 10 12:25:13 2016 -0700

    MIDI: Use server-side socket in blocking mode for virtual devices

    Since virtual MIDI servers may misbehave, blocking mode will throttle
    them if clients are not coping with their sending speed.

    Bug: 29413812
    Change-Id: I9c4a2a7a7ea3ea060c93fedc7d0f033427c557c9

commit 755dfb5f83749d3963c63d98d692307f8271c804
Author: Mikhail Naganov <mnaganov@google.com>
Date:   Fri Jul 8 13:26:19 2016 -0700

    Protect MIDI framework against client blocks in MidiReceiver.onSend

    Make the server-side socket non-blocking when creating MidiOutputPort
    for clients. Thus if a client ceases to read from its side of the
    socket pair, the server will just fail to write instead of blocking.

    One drawback is that the MidiOutputPort on the client can't indicate
    that it has become dysfunctional, but it's not possible without
    changing the API.

    Bug: 29413812
    Change-Id: I9dfcbdd214a815cea8fd1365324fd78ca459268a

commit c740b13953761f58233ac651a0b5227733b1bdcc
Author: Mikhail Naganov <mnaganov@google.com>
Date:   Fri Jun 17 04:11:25 2016 -0700

    UsbMidiDevice: Clean up terminology and fix comments

    When working with physical MIDI devices, an *input* stream is used
    for reading from *output* port of the device, and vice versa. Thus,
    using "input" and "output" without specifying whether it's a stream
    or a port is confusing.

    Clarify names of counter variables, and fix a couple of comments
    that were incorrect due to this confusion. No functional changes.

    Change-Id: If561eaca4bade94e9296d2c703c9fcebc91296e2

commit 4269c6417287737624f6165a8bbeb5aa427de9a0
Author: Glenn Kasten <gkasten@google.com>
Date:   Thu May 5 18:49:16 2016 -0700

    Update MIDI package summary

    Bug: 28625060
    Change-Id: If552ca8e1a0666d402b5f536699bf3fb09c1e324

commit 862d40b73168bde7d0be5280d997985c18061014
Author: Phil Burk <philburk@google.com>
Date:   Tue Apr 19 15:56:24 2016 -0700

    MidiDevice: do not open ports on closed device

    Fix involves client side mIsDeviceClosed flag.

    Bug: 24949216
    Change-Id: I666284a787fbb9a710d2372fb424e8e54f6a2825
    Signed-off-by: Phil Burk <philburk@google.com>

commit 6f1de358b9f2616e03f4655f01454770915ddd66
Author: Phil Burk <philburk@google.com>
Date:   Mon Apr 18 16:05:28 2016 -0700

    MidiService: fix resource leak

    The proxy object was being used to match when adding or removing objects.
    But they are different each time. So now we use an asBinder() object.

    Bug: 28153736
    Change-Id: I1bccebf1e9464668db757ff08b41902d0cf0e3a7
    Signed-off-by: Phil Burk <philburk@google.com>

commit f7386bd535bb8a1d7f8df8f44a1748ab770c991a
Author: Phil Burk <philburk@google.com>
Date:   Tue Apr 5 14:19:53 2016 -0700

    MidiDevice: fix connectPorts for same Process

    If connectPorts() was called for a device in the same process then
    the connection would die when the ParcelFileDescriptor was closed.

    Bug: 26406775
    Change-Id: Id0538452593b4761ac2a93d366ade76d2e35ce73
    Signed-off-by: Phil Burk <philburk@google.com>

Change-Id: I4dfc2a2cbaf04bf1a790ae2cb39bf74fb5bb16ac
2016-08-17 08:45:39 -07:00
Tobias Thierer
7783213611 Revert "Track libcore update of Map classes to jdk8u60"
May have broken stage-aosp-master since the CL from aosp-master was for
some reason only merged to mirror-aosp-master but no further.

Bug: 30911913

This reverts commit fb2ade3dca.

Change-Id: I696d2b0636708fc6c73a53cd3cae36fa5bd0f173
2016-08-17 14:59:28 +00:00
Treehugger Robot
c5b376ab66 Merge "UsbMidiDevice: fix MIDI flush()" 2016-08-17 13:57:33 +00:00
Tobias Thierer
fb2ade3dca Track libcore update of Map classes to jdk8u60
This adds the api/test-current.txt changes corresponding to
http://r.android.com/238640

This CL requires base CLs, which will get merged from aosp-master,
in order to build.

Change-Id: I0aa2e9c4c7b3b6af79c9885e7e0fdde8880e71c8
2016-08-17 11:06:27 +01:00
Tobias Thierer
ec6a323da2 Merge "Track libcore update of Map classes to jdk8u60." 2016-08-17 10:03:53 +00:00
Phil Burk
2f2bf4014a UsbMidiDevice: fix MIDI flush()
The proxy MidiReceiver in the USB device was not forwarding the flush
command to the event scheduler.

Bug: 25511696
Change-Id: I6a4759b71bc8f9ae3e20aed1238f62a2ed405e24
Signed-off-by: Phil Burk <philburk@google.com>
2016-08-16 16:57:36 -07:00
Dirk Dougherty
b042ab1eb6 dd new ds-static doc build target to generate static docs (only) for devsite without resolving @links.
Change-Id: I7d26fabfca74d8e706fd99cbeaa1761907c31dbf
2016-08-16 16:28:20 -07:00
Andrew Solovay
085994c40d docs: Docs for Support Library 24.2.0 release
Includes updates to the features doc, to reflect the v4 support
library's division into several smaller modules. Also modified
the transitions doc to note the support library's support for
transitions in API levels 14-19.

Since we're deprecating support for API levels below 9, I changed
several examples to use higher API levels.

See first comment for doc stage location.

bug: 30505601
Change-Id: Ic06a023f705893c91ff3b86d0af8cfed957eb724
2016-08-16 12:29:30 -07:00
Alan Viverette
ae3fecc1a9 Support library 24.2.0 API diff
Bug: 30864209
Change-Id: If41403b704ee121731b8e0b7ba62fda31c52d071
2016-08-16 14:06:00 -04:00
Eric Schmidt
32cc6b7fb7 docs: Fixed code snippet in notify-user/navigation.html
Bug: 25098348
Change-Id: Ic116900eb9c6e1ebfbc6b99673ffeff3f2df8533
2016-08-16 10:10:49 -07:00
Narayan Kamath
8e69dd2284 Process: Fix communication with zygote.
Don't write partial requests, and don't return (or throw) early after
partially reading a response.

bug: 30143607

(cherry-picked from commit 448be0a622)

Change-Id: I5881fdd5e81023cd21fb4d23a471a5031987a1f1
2016-08-16 17:21:49 +01:00
Narayan Kamath
e29c6493c0 Process: Fix communication with zygote.
Don't write partial requests, and don't return (or throw) early after
partially reading a response.

bug: 30143607

(cherry-picked from commit 448be0a622)

Change-Id: I5881fdd5e81023cd21fb4d23a471a5031987a1f1
2016-08-16 16:17:29 +00:00
Tobias Thierer
9d332f2dc8 Track libcore update of Map classes to jdk8u60.
Note that these additions are simply artifacts of the API generation
processes. These map methods were previously implemented by superclasses.

Test: make update-api

Change-Id: Ib03ca6afb438f2d7597abd0794cdebed2083bc17
2016-08-16 14:16:41 +01:00
Chih-Hung Hsieh
1ab51f3769 Merge "Fix google-explicit-constructor warnings." am: ea537bf5b3
am: 9c0b881c9d

Change-Id: If4ec2ed4609d130e2b25dae2bf90f2209878cd4c
2016-08-16 02:31:42 +00:00
Chih-Hung Hsieh
9c0b881c9d Merge "Fix google-explicit-constructor warnings."
am: ea537bf5b3

Change-Id: I38d1f635b7bf2c46648c852bf0caa421e67218f4
2016-08-16 02:23:48 +00:00
Treehugger Robot
ea537bf5b3 Merge "Fix google-explicit-constructor warnings." 2016-08-16 02:12:39 +00:00
Dirk Dougherty
c9107e3263 Merge "Doc change: escape lt char in generic type in pre block." into nyc-dev
am: 114c09498d

Change-Id: I436715dc13b9b9e8abc8d5c84d04e1e203269e7a
2016-08-16 01:29:51 +00:00
Dirk Dougherty
f98babb134 Doc change: escape lt char in generic type in pre block.
am: 1035b25825

Change-Id: Iecc647ac91d9d6d452091c214138a6e650babac0
2016-08-16 01:29:47 +00:00
Dirk Dougherty
114c09498d Merge "Doc change: escape lt char in generic type in pre block." into nyc-dev 2016-08-16 01:17:32 +00:00
Jim Miller
2d71384a13 Fix vulnerability in LockSettings service
Fixes bug 30003944

Change-Id: I8700d4424c6186c8d5e71d2fdede0223ad86904d
2016-08-16 00:09:33 +00:00
Chih-Hung Hsieh
ad3dea12ee Fix google-explicit-constructor warnings in common_time.
* Add explicit keyword to conversion constructors.
Bug: 28341362
Test: build with WITH_TIDY=1

Change-Id: Ieab4756042e77cfadda35e34f78f515058ae0bb3
2016-08-15 14:51:48 -07:00
Chih-Hung Hsieh
21c0f29597 Fix google-explicit-constructor warnings.
* Add explicit keyword to conversion constructors.
Bug: 28341362
Test: build with WITH_TIDY=1

Change-Id: I7422d703de17c4266d2a022990d0e1df40f48226
2016-08-15 14:45:02 -07:00
Julius D'souza
6864ffeead DO NOT MERGE ANYWHERE: Make slow brightness display ramp rate configurable. am: 13edf0a70b -s ours am: 0903c5fe7a -s ours
am: f51dfc24d1  -s ours

Change-Id: I1afeaa3f5321c536cad22455881b36582b468748
2016-08-15 19:47:43 +00:00
Julius D'souza
f51dfc24d1 DO NOT MERGE ANYWHERE: Make slow brightness display ramp rate configurable. am: 13edf0a70b -s ours
am: 0903c5fe7a  -s ours

Change-Id: Iba7ccc2ec071ea8c13d146b39aab48d2f4fc4977
2016-08-15 19:33:29 +00:00
Julius D'souza
0903c5fe7a DO NOT MERGE ANYWHERE: Make slow brightness display ramp rate configurable.
am: 13edf0a70b  -s ours

Change-Id: I7c02cea3ea0008f3f112063b6a06d08049c4998b
2016-08-15 19:25:33 +00:00
Julius D'souza
13edf0a70b DO NOT MERGE ANYWHERE: Make slow brightness display ramp rate configurable.
Add overlay setting with current default value.

Bug: 30085530
Change-Id: Ib5d2448b88cfb66a97febcdf06e2118c84b16cd0
2016-08-15 12:15:29 -07:00
David Gross
7cd06dc384 Merge "Update RenderScript docs: reduction, other API 23/24 changes, cleanup." into nyc-dev
am: 8cb4ca439e

Change-Id: I76c6a8ebc739daa1aa124fecccf6fcc341e8fd7a
2016-08-15 17:23:24 +00:00
David Gross
b869263b5d Update RenderScript docs: reduction, other API 23/24 changes, cleanup.
am: b50e856fc7

Change-Id: Iad5173dfd05c77284d74bbff2c095d91064a941f
2016-08-15 17:23:18 +00:00
David Gross
8cb4ca439e Merge "Update RenderScript docs: reduction, other API 23/24 changes, cleanup." into nyc-dev 2016-08-15 17:17:02 +00:00
Sudheer Shanka
a3af5c6207 DO NOT MERGE: Clean up when recycling a pid with a pending launch
Fix for accidental launch of a broadcast receiver in an
incorrect app instance.

Bug: 30202481
Change-Id: I84b74edc29ca3fb88048b44af682ecbeb176b774
2016-08-12 18:49:56 -07:00
Amith Yamasani
b02862c2cf DO NOT MERGE: Clean up when recycling a pid with a pending launch
Fix for accidental launch of a broadcast receiver in an
incorrect app instance.

Bug: 30202481
Change-Id: I8ec8f19c633f3aec8da084dab5fd5b312443336f
2016-08-12 18:32:42 -07:00
Amith Yamasani
a92810a189 DO NOT MERGE: Clean up when recycling a pid with a pending launch
Fix for accidental launch of a broadcast receiver in an
incorrect app instance.

Bug: 30202481
Change-Id: I8ec8f19c633f3aec8da084dab5fd5b312443336f
2016-08-12 18:28:45 -07:00
Amith Yamasani
d1eeb5b7b4 DO NOT MERGE: Clean up when recycling a pid with a pending launch
Fix for accidental launch of a broadcast receiver in an
incorrect app instance.

Bug: 30202481
Change-Id: I8ec8f19c633f3aec8da084dab5fd5b312443336f
2016-08-12 18:16:38 -07:00
Amith Yamasani
55eacb9441 DO NOT MERGE: Clean up when recycling a pid with a pending launch
Fix for accidental launch of a broadcast receiver in an
incorrect app instance.

Bug: 30202481
Change-Id: I8ec8f19c633f3aec8da084dab5fd5b312443336f
2016-08-12 18:07:51 -07:00
Mark Lu
fa43485910 docs: fix broken links in Activity reference
Bug: 30142414
Bug: 30837469
Change-Id: If370e49fee32df41b7dab93d6c89c79a9835dabb
2016-08-12 16:05:17 -07:00
Mark Lu
9f52b7a4a8 docs: fix link in Loader reference page
Bug: 29764129
Change-Id: I5ca881bb30adbbaf65ba37b1cf63903a4fc5600e
2016-08-12 15:48:05 -07:00
Phil Weaver
9e07404742 Limit capabilities of a11y gesture dispatch.
am: 157f416a35

Change-Id: Ib6c15ab515cf7d2b4bd55453b195bf82d225f272
2016-08-12 21:05:00 +00:00
David Christie
41a0dd41f1 Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug: 29555864 am: dde12c6923 am: 3462e52676 am: 5a6b11114a am: 655361b2b1
am: 62783bde30

Change-Id: I466311d2aa3983e690778fb1084f93eab7e8ae7d
2016-08-12 20:17:03 +00:00
David Christie
1081a15fd4 resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2
am: b7f8b59e24

Change-Id: I26eda3647447490d58777d9fd8b2055ab8574e5e
2016-08-12 20:17:00 +00:00
David Christie
62783bde30 Fix vulnerability where large GPS XTRA data can be injected. -Can potentially crash system with OOM. Bug: 29555864 am: dde12c6923 am: 3462e52676 am: 5a6b11114a
am: 655361b2b1

Change-Id: I39e11f906f059cf8bb1ea861490a0e9051d11bed
2016-08-12 20:09:56 +00:00
Elliott Hughes
c41a11a0ee Merge "recvfrom takes a non-const pointer." am: 96660b37a1
am: 2f4c6e3d0d

Change-Id: I84f726f12c27f66c668026f913708bb8d2a7cfff
2016-08-12 20:09:56 +00:00
David Christie
b7f8b59e24 resolve merge conflicts of b4a5615 to lmp-dev
am: 288166cbb2

Change-Id: Ie8927cbe2b224241f8d896487ff17117c15c0255
2016-08-12 20:09:54 +00:00
Mark Lu
5dabf06ae5 docs: rewrite one attribute description in R.attr
Bug: 6440151
Change-Id: Ia5a28b33e40ad3de8320bb8e2c314f6e49fe4edd
2016-08-12 13:05:25 -07:00
Mark Lu
53415ff24e docs: Fix typo and broken link in AsyncTask.java
Bug: 29323321
Change-Id: Ie3a62480bfee881083b5d266cbc1481fb148d237
2016-08-12 13:02:32 -07:00
Elliott Hughes
2f4c6e3d0d Merge "recvfrom takes a non-const pointer."
am: 96660b37a1

Change-Id: Ief2e969ec0498ac2c9264fa34a3de36773bc43fa
2016-08-12 19:58:55 +00:00