252071 Commits

Author SHA1 Message Date
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
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
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
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
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
Elliott Hughes
2f4c6e3d0d Merge "recvfrom takes a non-const pointer."
am: 96660b37a1

Change-Id: Ief2e969ec0498ac2c9264fa34a3de36773bc43fa
2016-08-12 19:58:55 +00:00
Treehugger Robot
96660b37a1 Merge "recvfrom takes a non-const pointer." 2016-08-12 19:48:38 +00:00
Chih-Hung Hsieh
b3d46b44a3 resolve merge conflicts of 17bd236 to stage-aosp-master
Change-Id: I08d4500aaa378b08d41e8d046c62101e08dbfba8
2016-08-12 11:44:16 -07:00
Chih-hung Hsieh
17bd236b4b Merge "Fix clang-tidy warnings in aapt and aapt2." 2016-08-12 18:05:32 +00:00
Elliott Hughes
2fa54ef232 recvfrom takes a non-const pointer.
Change-Id: Ib2c8f2710cb333904106f849f492c83697fdd937
2016-08-12 10:53:48 -07:00
Chih-Hung Hsieh
ed935c32f4 resolve merge conflicts of 76ce8e5 to stage-aosp-master
Change-Id: I4b4ca9906373a95776d2da8ba2fa39a4a78e2a30
2016-08-11 16:48:46 -07:00
Treehugger Robot
76ce8e5242 Merge "Fix clang-tidy warnings in libs/hwui." 2016-08-11 23:20:47 +00:00
Jakub Pawlowski
5aa4ba3776 resolve merge conflicts of 5671277 to stage-aosp-master
Change-Id: I71e3bd497dbdc0b3f297ad311620aa77bf7225ac
2016-08-11 15:53:06 -07:00
Jakub Pawlowski
5671277d2a Merge "Add LE Secure Connection data parsing (1/4)" 2016-08-11 22:32:23 +00:00
Chih-Hung Hsieh
8bd37ba458 Fix clang-tidy warnings in aapt and aapt2.
* Add explicit keyword to conversion constructors.
* Add NOLINT(implicit) comments for implicit conversion constructors.
Bug: 28341362
* Use const reference type for read-only parameters.
Bug: 30407689
* Use const reference type to avoid unnecessary copy.
Bug: 30413862
Test: build with WITH_TIDY=1

Change-Id: Id6d21961f313a1ad92b15a37fdaa5be9e8ab48e1
Merged-In: Id6d21961f313a1ad92b15a37fdaa5be9e8ab48e1
2016-08-11 15:20:10 -07:00
Jakub Pawlowski
747711ce9b Add LE Secure Connection data parsing (1/4)
Bug: 30460956
Change-Id: I8d6e721b3b04f5ca9e3e02f7f2b90487482e1b37
2016-08-11 22:18:19 +00:00
Hans Boehm
c97c9dbd96 Merge "Do not stack allocate RefBase object in AaptAssets::filter"
am: d0197ac340

Change-Id: I077f9c190025d688af17d1a840b841cbdc4e003d
2016-08-11 17:28:07 +00:00
Hans Boehm
d0197ac340 Merge "Do not stack allocate RefBase object in AaptAssets::filter" 2016-08-11 17:18:22 +00:00
Hans Boehm
25dfa75ee3 Do not stack allocate RefBase object in AaptAssets::filter
Doing so is likely to trigger log messages in the future, and will
hinder diagnosis of other problems.

Bug: 30292538
Change-Id: I2cb8c507e43d06d4afa7e35b564416c1474c81d1
2016-08-10 19:56:50 -07:00
Chih-Hung Hsieh
f35c939cd7 Fix clang-tidy warnings in libs/hwui.
* Add explicit keyword to conversion constructors.
Bug: 28341362
* Use const reference type for read-only parameters.
Bug: 30407689
Test: build with WITH_TIDY=1

Change-Id: Iab3e6636f60a70cb124f29dc19f20f842fa8dfda
Merged-In: Iab3e6636f60a70cb124f29dc19f20f842fa8dfda
2016-08-10 23:26:59 +00:00
Robert Greenwalt
bda5769701 Merge "[NetworkPolicy]: Fixes the crash issues caused by null pointer."
am: 2438a33e54

Change-Id: I5e8e5048718edf82008b58964d90b3cc10115c71
2016-08-10 21:20:39 +00:00
Robert Greenwalt
2438a33e54 Merge "[NetworkPolicy]: Fixes the crash issues caused by null pointer." 2016-08-10 21:07:26 +00:00
zhangshuxiao
bad369d63e [NetworkPolicy]: Fixes the crash issues caused by null pointer.
When handleRegisterNetworkAgent in ConnectivityService,
the networkinfo of NetworkAgentInfo will be set to null.
So we need to handle the null pointer of state.networkInfo.

Change-Id: I2a278f1f1b2455057fd2ed323ff4df340c3cbca9
Signed-off-by: zhangshuxiao <zhangshuxiao@xiaomi.com>
2016-08-10 03:49:54 +00:00
Chad Brubaker
6e1f860c6a Merge "Add stub isCTVerificationRequired methods"
am: 5b63231a31

Change-Id: Ica40dc0da1821aa47825e615f0f3b629e0358568
2016-08-09 19:43:50 +00:00
Chad Brubaker
5b63231a31 Merge "Add stub isCTVerificationRequired methods" 2016-08-09 19:13:01 +00:00
Yi Kong
2ae4d32ca3 Merge "Track libcore change ee24b6322448ac919231a668e308ebd719aa52d7"
am: 67aaa079ee

Change-Id: I8b0bb02aca968de0baa7864cf4e123e4dd60b594
2016-08-09 18:07:12 +00:00
Yi Kong
67aaa079ee Merge "Track libcore change ee24b6322448ac919231a668e308ebd719aa52d7" 2016-08-09 17:59:07 +00:00
Yi Kong
19df48b93b Track libcore change ee24b6322448ac919231a668e308ebd719aa52d7
Change-Id: I73dd6af604304ea4eb8e01990454f491af659602
(cherry picked from commit f646aa14cdbf34e8784c0411d0baca26e364c1dc)
2016-08-09 18:57:16 +01:00