251951 Commits

Author SHA1 Message Date
Chih-Hung Hsieh
a619ec70cf Fix google-explicit-constructor warnings in libs/hwui.
* Add explicit keyword to conversion constructors,
  or add NOLINT for implicit converters.
Bug: 28341362
Test: build with WITH_TIDY=1

Change-Id: Id8ca42433a4fc3652e4cb13787c4cb169f20d9a9
2016-08-29 14:56:58 -07:00
Treehugger Robot
c4c4a1e76e Merge "Track getxattr API change" 2016-08-29 07:57:30 +00:00
Yi Kong
c44a6e08e2 Track getxattr API change
Bug: 30992227
Change-Id: I788b3e51a536c7df7896f622038fe762f9848a2a
2016-08-27 12:16:44 +01:00
Treehugger Robot
e2732e5e38 Merge "Fix misc-macro-parentheses warnings in hwui/tests." 2016-08-26 23:45:07 +00:00
Chih-Hung Hsieh
474081eee1 Fix misc-macro-parentheses warnings in hwui/tests.
* Add parentheses around macro parameters.
Bug: 28705665

Test: build with WITH_TIDY=1
Change-Id: I04f6dd1a180ed1191bf68b685facf6fb9020b4b0
2016-08-26 15:19:47 -07:00
Colin Cross
611e205bbe Merge "Replace libziparchive-host with libziparchive" 2016-08-26 20:18:55 +00:00
Colin Cross
9a1a3bcb16 Replace libziparchive-host with libziparchive
libziparchive-host is no longer necessary, and mixing libziparchive-host
and libziparchive can cause ODR violations.

Change-Id: I623c0c5579e28f26a6e1db7bd953f33ed1ca68cd
2016-08-26 11:15:17 -07:00
Treehugger Robot
43ec5716aa Merge "Track java.lang.reflect.Executable API changes" 2016-08-26 15:03:22 +00:00
Neil Fuller
2af6c750ba Track java.lang.reflect.Executable API changes
Bug: 28666126
Change-Id: I764c2c14036c4188c4dc4bb2cae40ae8745c3b26
2016-08-26 10:44:51 +01:00
Treehugger Robot
7f9ed1cd85 Merge "DO NOT MERGE ANYWHERE - Clear preferences when package is removed." 2016-08-25 20:57:25 +00:00
Martijn Coenen
0a357a1a73 Merge changes from topic 'utf'
* changes:
  Add bound checks to utf16_to_utf8
  Unicode: specify destination length in utf8_to_utf16 methods
2016-08-25 20:08:14 +00:00
Treehugger Robot
175621f517 Merge "Fix suspend crash issue on no GPU platform." 2016-08-25 18:01:06 +00:00
Sergio Giro
d90d8d615a Add bound checks to utf16_to_utf8
Test: ran libaapt2_tests64
Bug: 29250543
Change-Id: I1ebc017af623b6514cf0c493e8cd8e1d59ea26c3
(cherry picked from commit 4781057e78f63e0e99af109cebf3b6a78f4bfbb6)
2016-08-25 12:19:12 +02:00
Sergio Giro
8f7b8a1f6c Unicode: specify destination length in utf8_to_utf16 methods
Change-Id: I5223caa7d42f4582a982609a898a02043265c6d3
2016-08-25 12:04:40 +02:00
Ivan.liu
984827cc9c Fix suspend crash issue on no GPU platform.
eglChooseConfig should return false only if an error occured.
If eglChooseConfig is called with a valid attribute list,
no internal EGL errors occur. And if no available config matches
the requested attribute list, no configs are returned.
Not only the return value of eglChooseConfig should be checked,
the 'num_config' out-param must be inspected too.
If no configs were returned, and no error occurred, then 'num_config' will be 0.

Change-Id: Id36d88820b8e33713bc83e0d4b90c3fee7f005fd
Signed-off-by: Xiaowen Liu <xiaowen.liu@nxp.com>
2016-08-25 10:50:54 +08:00
Felipe Leme
910e6efe84 DO NOT MERGE ANYWHERE - Clear preferences when package is removed.
(cherry pick of commits 2154caf2f80fa87df84813b8e344f85094a454fd and
da1fc0a9c23697cc255efdccc47862bd1277da3f).

Change-Id: I5a019d771da6ff52ea36ee683a44405f6ea24853
Fixes: 30900628
Fixes: 28722556
(cherry picked from commit 20488d97cdc9aa7e98f6fd75c2890ba18781654a)
2016-08-24 14:27:48 -07:00
Bill Yi
e71ecb2c4d Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
Change-Id: I1c7301e4e6d7e5fed1fd57d2fb9cb65baf819de0
2016-08-24 11:23:13 -07:00
Sergio Giro
5d4732555d Merge "javax.crypto.spec: update PBEParameterSpec to Java 8" 2016-08-24 14:54:47 +00:00
Sergio Giro
c7f97dbd57 Merge "javax.crypto: update classes in javax.crypto (part 2)" 2016-08-24 14:54:17 +00:00
Sergio Giro
5b24bccbc8 Merge "java.security.spec: add public field in MGF1ParameterSpec" 2016-08-24 14:53:42 +00:00
Sergio Giro
29835cc56e frameworks/base: add changes coming from aosp
Corresponding to aosp changes:
https://android-review.googlesource.com/261231
https://android-review.googlesource.com/261194
https://android-review.googlesource.com/261211

Change-Id: I13caa90b7f97d5aa447050f89a5312d22db3d277
2016-08-24 15:45:02 +01:00
John Reck
621fb590e3 resolve merge conflicts of 24e38ab to stage-aosp-master
Change-Id: I02db3eb317ccb182b563ec9350a116bd5de063b6
2016-08-23 15:10:47 -07:00
Sergio Giro
0a7e139090 javax.crypto.spec: update PBEParameterSpec to Java 8
Pulling upstream changes from OpenJDK version jdk8u60 for
PBEParameterSpec.

Added new constructor allowing an AlgorithmParameterSpec and the
corresponding getter getParameterSpec.

This CL finishes the port of this package.

Change-Id: I02d463285e185fcb4031a5266d2857b1530159b7
Test: make droid docs, vogar PBEParameterSpecTest
Bug: 29631070
2016-08-23 22:08:13 +01:00
Jakub Pawlowski
d0a0ae349c Merge "Add WorkSource to BLE scanning API" 2016-08-23 21:07:32 +00:00
Sergio Giro
99b208632e javax.crypto: update classes in javax.crypto (part 2)
Pulling upstream changes from OpenJDK version jdk8u60 for
SecretKey, SecretKeyFactory and SecretKeyFactorySpi.

- SecretKey now extends javax.security.auth.Destroyable
- Second parameter of SecretKeyFactory#getKeySpec is now Class<?>
instead of Class
- Second parameter of SecretKeyFactorySpi#engineGetKeySpec is now
Class<?> instead of Class

This commit also contains cosmetic JavaDoc changes like
- Use of @code in place of <code> tags.
- Tidied up casts/generics.

Note not all classes in javax.crypto are updated: CipherInputStream,
CipherOutputStream, CipherSpi have changes that deserve a separate CL.

All API changes in the package are ported.

Change-Id: Iaa0ce3e34f9f73260e7b66db601b5cb1462aa854
Test: make droid docs
Bug: 29631070
2016-08-23 21:27:45 +01:00
Sergio Giro
86aa7c6157 java.security.spec: add public field in MGF1ParameterSpec
Pulling upstream changes from OpenJDK version jdk8u60 for
MGF1ParameterSpec.

Adding a public field for SHA224, defined in the same way
as existing ones for other SHA functions.

This completes the update of this package for jdk8u60.

Change-Id: I2416fb73050336a4a741c22bad3f2d740715647b
Test: make droid docs
Bug: 29631070
2016-08-23 20:33:24 +01:00
John Reck
24e38ab322 Merge "Fix native memory leak caused by small HWUI path cache creation" 2016-08-22 21:48:31 +00:00
Ajay Panicker
b987832918 Merge "Allow getResponseCode to block if response hasn't been received from remote"
am: 834e5ce170

Change-Id: I3fc5b8c49623f6054995029105c4f6712ec63674
2016-08-22 20:47:48 +00:00
Treehugger Robot
834e5ce170 Merge "Allow getResponseCode to block if response hasn't been received from remote" 2016-08-22 20:34:14 +00:00
Adam Lesinski
401c208db8 Add WorkSource to BLE scanning API
This will allow apps that do work on behalf of others to correctly blame
those apps for the power implications of BLE scanning.

Bug:22718669
Change-Id: I1cbca8cf7bbe1ec5b804228f466fd9dd6fc68183
2016-08-22 11:40:23 -07:00
Ajay Panicker
f8c2ad085b Allow getResponseCode to block if response hasn't been received from remote
Bug: 30645605
Change-Id: I9854ccbe98ace6d5490cb99586ca36379f5a1db1
2016-08-22 18:25:14 +00:00
caiqinl
4b505376cb Fix native memory leak caused by small HWUI path cache creation
HWUI calculates the texture size as w*h*bpp. In some cases, the
calculated path cache is small, but the actual memory allocated
in driver is 4k/8k/16k, much bigger than HWUI calculates.

Example: a 5*65 alpha texture, HWUI think it is 5*65*1 = 325 bytes,
but driver allocates 8K. An app can allocates up to 32M path textures,
which actually consumes 32M*(8*1024/325) = 806M memory.

Here we limit the number of path texture in the cache to 256, it
should be a pretty generous global limit.

Change-Id: I890819b73bb0b7f63e96bc3d9d0ff9469c16838c
2016-08-22 11:22:43 +05:30
Ajay Panicker
779a1f096c Merge "Protect various Bluetooth broadcasts"
am: 53ff75bb68

Change-Id: Id4f77ea2092f9a04397fe596ed92f2f30a3235df
2016-08-18 22:32:09 +00:00
Treehugger Robot
53ff75bb68 Merge "Protect various Bluetooth broadcasts" 2016-08-18 22:25:40 +00:00
Ajay Panicker
1f5b786ad0 Protect various Bluetooth broadcasts
Bug: 30832954
Change-Id: I37e0b2ffab65c0703244917a4ade9bb8afbb5e6f
(cherry picked from commit 9a236066dbf604edfd5f873b4a3b94a200efd628)
2016-08-18 13:50:13 -07:00
Dmitriy Filchenko
33e65232f3 Merge "Remove unused includes."
am: 35da832634

Change-Id: I5804c0ccf6c543471ddf3245a799d5fa651d6d18
2016-08-18 03:22:39 +00:00
Treehugger Robot
35da832634 Merge "Remove unused includes." 2016-08-18 03:17:04 +00:00
Dmitriy Filchenko
7310cc4880 Remove unused includes.
BUG: 29824203

Change-Id: I795f8abe31575f70da263921c6ec13b73b24dc7b
2016-08-18 01:45:11 +00:00
Glenn Kasten
67ffd5e617 resolve merge conflicts of c76a3ac to stage-aosp-master
Change-Id: Ifff16bdc42e8326f3f60cf4b92688c445cb4db25
2016-08-17 13:28:04 -07:00
Chih-hung Hsieh
9b36ce973e Merge "Fix google-explicit-constructor warnings in common_time."
am: 67d47e0ca6

Change-Id: I2548e50d2654d3dfacd175b4db118983848bf15c
2016-08-17 18:06:22 +00:00
Glenn Kasten
c76a3ac224 Merge "Squashed commit of the following:" 2016-08-17 18:02:53 +00:00
Chih-hung Hsieh
67d47e0ca6 Merge "Fix google-explicit-constructor warnings in common_time." 2016-08-17 17:42:52 +00:00
Tobias Thierer
6f15eabd29 Merge "Revert "Revert "Track libcore update of Map classes to jdk8u60""" into stage-aosp-master 2016-08-17 17:38:48 +00:00
Tobias Thierer
7f5095ddfe Revert "Revert "Track libcore update of Map classes to jdk8u60""
Automerger issues have been resolved. This change needs
to be rolled forward once Automerger merges
http://r.android.com/255655 from mirror-aosp-master into
stage-aosp-master.

This reverts commit 778321361132672ea1174e4ca3f5397477c32690.

Change-Id: I16e1d94351ccf7cc1aeb8f9905410cd23514e8ff
2016-08-17 17:11:01 +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
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 fb2ade3dcab0962f18acab720875c75622f412ed.

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