summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* add number constraint for samples per MotionEventandroid-5.1.1_r34android-5.1.1_r33android-5.1.1_r30Flanker2015-10-272-1/+7
| | | | | | | | | | Bug:23905002 Signed-off-by: Adam Lesinski <adamlesinski@google.com> (cherry picked from commit 552a8a5d8df32f659b8d11311a244cdc6d3b7733) Change-Id: I9b7ea859889b7697bee4165a2746602212120543
* Initialize local variables to avoid data leakandroid-cts-5.1_r5android-cts-5.1_r4android-5.1.1_r26android-5.1.1_r25Naveen Leekha2015-09-281-1/+1
| | | | | | | | | | | | | | | | The uninitialized local variables pick up whatever the memory content was there on stack. This data gets sent to the remote process in case of a failed transaction, which is a security issue. Fixed. (Partial manual merge of master change 12ba0f57d028a9c8f4eb3afddc326b70677d1e0c. Rest to automerge from klp-dev) For b/23696300 Change-Id: I704c9fab327b3545c58e8a9a96ac542eb7469c2a
* Initialize local variables to avoid data leakNaveen Leekha2015-09-281-2/+2
| | | | | | | | | | | | | | | The uninitialized local variables pick up whatever the memory content was there on stack. This data gets sent to the remote process in case of a failed transaction, which is a security issue. Fixed. (Manual merge of master change 12ba0f57d028a9c8f4eb3afddc326b70677d1e0c ) For b/23696300 Change-Id: I665212d10da56f0803b5bb772d14c77e632ba2ab
* Disregard alleged binder entities beyond parcel boundsandroid-cts-5.1_r3android-5.1.1_r24android-5.1.1_r20android-5.1.1_r19android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14Christopher Tate2015-08-131-1/+1
| | | | | | | | | | | When appending one parcel's contents to another, ignore binder objects within the source Parcel that appear to lie beyond the formal bounds of that Parcel's data buffer. Bug 17312693 Change-Id: If592a260f3fcd9a56fc160e7feb2c8b44c73f514 (cherry picked from commit 27182be9f20f4f5b48316666429f09b9ecc1f22e)
* Verify that the native handle was createdAdam Lesinski2015-08-131-0/+4
| | | | | | | | | | The inputs to native_handle_create can cause an overflowed allocation, so check the return value of native_handle_create before accessing the memory it returns. Bug:19334482 Change-Id: I1f489382776c2a1390793a79dc27ea17baa9b2a2 (cherry picked from commit eaac99a7172da52a76ba48c26413778a74951b1a)
* Update maxNumber to be smaller.android-cts-5.1_r2android-cts-5.1_r1android-5.1.1_r9android-5.1.1_r6android-5.1.1_r4android-5.1.1_r3android-5.1.1_r2android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1Michael Lentine2015-02-181-1/+5
| | | | | | | | | There shouldn't be more than 4096 fds (probably signficantly smaller) and there shouldn't be more than 4096 ints. Bug: 18076253 Change-Id: I3a3e50ee3078a4710e9737114e65afc923ed0573
* Revert "omx: add Intel's SemiPlanar OMX color format that is used on some ↵Lajos Molnar2015-02-111-1/+0
| | | | | | | | | devices" This reverts commit 61b17d64f90b85fd367ea1c7609cac69485957d4. Bug: 19317169 Change-Id: Ib1fcc26c46a52c848ffa8238ddbf6abfe57cfa5d
* merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2015-02-090-0/+0
|\
| * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2015-02-050-0/+0
| |\
| | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2015-01-290-0/+0
| | |\
| | | * Remove lock around ref count check in terminate.Michael Lentine2015-01-282-120/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace the global lock in terminate for the ref count check with atomics and a local lock. Bug: 19072064 Change-Id: I0cfd6564e227a75b8387a8788b16381d5bc2cc88
| | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2015-01-280-0/+0
| | | |\
| | | | * SurfaceFlinger: Make log message 64-bit compatibleDan Stoza2015-01-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes the build on 64-bit targets that complain about using a size_t with a %d in a format string Change-Id: I7dfcd3a49eb0dbc5dffeb82bb7208de7f7925f08
| | | | * SurfaceFlinger: Attempt to attribute fds to layersDan Stoza2015-01-162-1/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This tracks fds when layers are created and destroyed in an effort to determine which specific app (if any) is active when fds are leaked Bug: 19017008 Change-Id: I1f1d5a9cbc1399e3df3a2d350324f80b3a4e3477
| | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2015-01-150-0/+0
| | | | |\
| | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2015-01-120-0/+0
| | | | | |\
| | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-12-220-0/+0
| | | | | | |\
| | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-12-110-0/+0
| | | | | | | |\
| | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-12-040-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-11-270-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-11-240-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-11-200-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-11-180-0/+0
| | | | | | | | | | | | |\
* | | | | | | | | | | | | | DO NOT MERGE: omx: add OMX_INTEL_COLOR_FormatYUV420PackedSemiPlanarLajos Molnar2015-02-061-0/+1
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This seems to have the same layout as OMX_COLOR_FormatYUV420SemiPlanar, but used under this value on some devices. Bug: 19246722 Change-Id: Ib866024e52cf7b12608f02eefc43c6d58a1c0aa1
* | | | | | | | | | | | | add bUsingNativeBuffers to DescribeColorFormatParamsLajos Molnar2015-01-301-5/+20
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed to find proper color format for flex-YUV native buffer support. Bug: 19179927 Change-Id: I91ae6764e302c4307a0750c1d6820506d735c942
* | | | | | | | | | | | Merge "CpuConsumer: lock buffers that could be YUV as ycbcr" into lmp-mr1-devLajos Molnar2015-01-292-39/+64
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | CpuConsumer: lock buffers that could be YUV as ycbcrLajos Molnar2015-01-282-39/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17906609 Change-Id: Ic71af69ec3b19ab1224ed3ad5e0a97c60e81cda6
* | | | | | | | | | | | | GraphicBufferMapper: handle devices that do not implement lock_ycbcrLajos Molnar2015-01-281-2/+9
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19179927 Change-Id: I09ffca954fed3cd2d3466c8396627dc7dbc0052d
* | | | | | | | | | | | Merge "Remove lock around ref count check in terminate." into lmp-mr1-devMichael Lentine2015-01-282-120/+147
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Remove lock around ref count check in terminate.Michael Lentine2015-01-282-120/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace the global lock in terminate for the ref count check with atomics and a local lock. Bug: 19072064 Change-Id: I0cfd6564e227a75b8387a8788b16381d5bc2cc88
* | | | | | | | | | | | Revert "SurfaceFlinger: Attempt to attribute fds to layers"Dan Stoza2015-01-272-98/+1
|/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 03eccb6616744c3789b6018680de7bf5a18f71ce. Change-Id: I4f0da7bb62bf77bb3d399aee601beae5e03928fe
* | | | | | | | | | | SurfaceFlinger: Make log message 64-bit compatibleDan Stoza2015-01-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes the build on 64-bit targets that complain about using a size_t with a %d in a format string Change-Id: I7dfcd3a49eb0dbc5dffeb82bb7208de7f7925f08
* | | | | | | | | | | SurfaceFlinger: Attempt to attribute fds to layersDan Stoza2015-01-162-1/+98
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This tracks fds when layers are created and destroyed in an effort to determine which specific app (if any) is active when fds are leaked Bug: 19017008 Change-Id: I1f1d5a9cbc1399e3df3a2d350324f80b3a4e3477
* | | | | | | | | | Use the timeout stack dump functions.Christopher Ferris2015-01-141-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the native stack dumping functions that allows time outs. If debuggerd locks up, before a bugreport would hang forever. Now it will timeout properly and still get all of the other information. Bug: 18766581 Change-Id: I85053b8dcfe6224e2b64b4d8f7f2ef448b3cda34
* | | | | | | | | | Fix message when a command times out.Christopher Ferris2015-01-141-1/+1
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous version printed out the nanoseconds elapsed, not seconds. Bug: 18766581 (cherry picked from commit 67c5a8af9ed128d8bb56d4723303aef6f0a4500f) Change-Id: Icbaaee83a92767694fd98e3c790f36f4d24681b0
* | | | | | | | | OpenMax IL: Added support for E-AC3 codec configuration paramsRachad2014-12-232-0/+11
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17883772 Change-Id: Ibf00534607db4bba14c935cf1eaa80eb740297f9
* | | | | | | | Merge "Installd: Swap file for dex2oat" into lmp-mr1-devBrian Carlstrom2014-12-191-5/+61
|\ \ \ \ \ \ \ \
| * | | | | | | | Installd: Swap file for dex2oatAndreas Gampe2014-12-181-5/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add swap file support for dex2oat to installd. Only use in low-memory mode. Bug: 18596910 Change-Id: I131448f3907115054a592af73db86d2b9257ea33
* | | | | | | | | Increase growth limit from 64m to 80m for 1024mb hdpi tabletMathieu Chartier2014-12-111-1/+1
| |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevents apps hitting oome due to old linear alloc objects being allocated in the java heap causing the heap to be larger than it used to be. Bug: 18707227 Change-Id: Ia49a7e6b24ae9fba1961d600d4599c17313b556b
* | | | | | | | Switch to libsigchain.aDmitriy Ivanov2014-12-102-23/+4
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use LOCAL_WHOLE_STATIC_LIBRARIES to instruct static linker to export symbols from the static library. (cherry picked from commit 4340a14fbfe761a46e7a655b568cbd0953773df3) Bug: 18701723 Change-Id: I70f6fdb64b0d1adbadf96c8de85870a903ec186a
* | | | | | | am 784fd39a: resolved conflicts for merge of d6308379 to lmp-devMichael Lentine2014-12-040-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | * commit '784fd39a19f659e3b464bd9a78361c0adc1cdcab': Fix for corruption when numFds or numInts is too large.
| * | | | | | resolved conflicts for merge of d6308379 to lmp-devMichael Lentine2014-12-021-1/+16
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I92ed61b6fdfe458cf5f8bfd6f0b37ff736280500
| | * \ \ \ \ \ am 76ebd319: am 3d89edca: am e6f7a44e: Fix for corruption when numFds or ↵Michael Lentine2014-12-021-1/+16
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | numInts is too large. * commit '76ebd319d96494049a2a598f4449c0ec417220f6': Fix for corruption when numFds or numInts is too large.
| | | * \ \ \ \ \ am 3d89edca: am e6f7a44e: Fix for corruption when numFds or numInts is too ↵Michael Lentine2014-12-021-1/+16
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | large. * commit '3d89edca65e07319c9ac3b9bb9889e80e8c40578': Fix for corruption when numFds or numInts is too large.
| | | | * \ \ \ \ \ am e6f7a44e: Fix for corruption when numFds or numInts is too large.Michael Lentine2014-12-021-1/+16
| | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e6f7a44e835d320593fa33052f35ea52948ff0b2': Fix for corruption when numFds or numInts is too large.
| | | | | * | | | | | Fix for corruption when numFds or numInts is too large.Michael Lentine2014-11-211-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18076253 Change-Id: I4c5935440013fc755e1d123049290383f4659fb6
* | | | | | | | | | | Revert "Camera: Add XML entries and files for new system features"Eino-Ville Talvala2014-12-034-47/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e86d1091766b012da1f6616c7ec270d332baef95. Bug: 18281970 Bug: 18573576 Change-Id: If1cf236ef7eabd15ffb2a5dd33d25a8acabdd14c
* | | | | | | | | | | SurfaceFlinger: Listen to HWC invalidateDan Stoza2014-12-021-2/+4
| |_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Do less work when using PTS" broke the invalidate path up from HWC to SurfaceFlinger. When HWC would signal an invalidate, SurfaceFinger would wake up, see no new buffers, and go back to sleep. This is fine, except when the invalidate is a result of an HDMI hotplug, in which case the screen remains blank. This change makes that functionality work again. Bug: 18564815 Bug: 18558468 Change-Id: I2e2171d86839945f4e4e6555d66f7e2895bd096a
* | | | | | | | | | Merge "Add clamp to Layer and update Transform inverse." into lmp-mr1-devMichael Lentine2014-11-252-17/+29
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add clamp to Layer and update Transform inverse.Michael Lentine2014-11-212-17/+29
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure that the adjusted transparent region is within the display bounds by clamping after the transformation is applied and clean up transform's inverse function. Bug: 18452546 Change-Id: Ia473e483ee8374177bcb84d8192eb1f0e86f022a