Adam Powell
e4275843fe
am c6a06d43: Merge "Revert "Fix issue with using locally defined attrs in a shared lib"" into lmp-dev
...
* commit 'c6a06d437cf2ee7926a01b2f8ee685555bfb3d81':
Revert "Fix issue with using locally defined attrs in a shared lib"
2014-10-01 22:37:27 +00:00
Adam Powell
c6a06d437c
Merge "Revert "Fix issue with using locally defined attrs in a shared lib"" into lmp-dev
2014-10-01 18:31:56 +00:00
Adam Powell
908c748096
Revert "Fix issue with using locally defined attrs in a shared lib"
...
This reverts commit 5069dd69898bd0d9c69ba2bbd37239ec8d1c9dc6.
The reverted commit caused issues loading resources supplied by static libraries.
Bug 17748356
Change-Id: I860a4f31451ee7c03c02974826472a67226b029f
2014-10-01 18:11:18 +00:00
Adam Lesinski
d388b1fdde
am cd8e7381: Merge "Fix issue with using locally defined attrs in a shared lib" into lmp-dev
...
* commit 'cd8e73817d14798f9d2031ffd301a03a096b7907':
Fix issue with using locally defined attrs in a shared lib
2014-10-01 00:44:31 +00:00
Adam Lesinski
cd8e73817d
Merge "Fix issue with using locally defined attrs in a shared lib" into lmp-dev
2014-10-01 00:39:57 +00:00
Elliott Hughes
921d8e2ddb
am ee7684ca: am 04517286: Merge "Use strerror(3) when reporting zygote failures."
...
* commit 'ee7684cad00a13fc82519599ad8fab3cfbd6fe8b':
Use strerror(3) when reporting zygote failures.
2014-09-30 23:51:04 +00:00
Adam Lesinski
5069dd6989
Fix issue with using locally defined attrs in a shared lib
...
The attribute name resource IDs were never fixed up with
the runtime package ID so we weren't finding attributes
whenever the runtime package ID was different than the build
time one, which happened to be when a shared lib referenced itself
(0x00 vs 0x02).
Bug:17666947
Change-Id: Icf3e874bcea0e27eebe42d60fbed626a34bf9266
2014-09-30 16:18:09 -07:00
Ruben Brunk
e06a3d8253
am b3c802f2: Merge "camera2: Use valid dimensions for RGBA8888 gralloc buffers." into lmp-dev
...
* commit 'b3c802f2381c3411fe753206ab89027f60164b77':
camera2: Use valid dimensions for RGBA8888 gralloc buffers.
2014-09-30 22:09:18 +00:00
Ruben Brunk
b3c802f238
Merge "camera2: Use valid dimensions for RGBA8888 gralloc buffers." into lmp-dev
2014-09-30 22:05:48 +00:00
Ruben Brunk
0c79884076
camera2: Use valid dimensions for RGBA8888 gralloc buffers.
...
Bug: 17675571
- All of the mistakes were made. Unmake them.
Change-Id: I23ff7a553347d4d9588c728219f4bf0604ba2e38
2014-09-30 13:54:20 -07:00
Dianne Hackborn
ed1589d81f
am 9cf01b63: Merge "More work on issue #17656716 : Unhandled exception in Window Manager" into lmp-dev
...
* commit '9cf01b63cb0023aec0e05b1ce050ff572532b876':
More work on issue #17656716 : Unhandled exception in Window Manager
2014-09-30 20:23:01 +00:00
Dianne Hackborn
ce92b0d070
More work on issue #17656716 : Unhandled exception in Window Manager
...
Drop down the limit on when we log, since under normal operation we
will never get more than a few K of data due to strict mode.
Try to clean up the code paths coming in and out of binder IPCs to
plug any places where we could disrupt the gather flag of a thread,
causing it to keep gathering stack crawls (which is the thing that
is causing our strict mode data to become so large).
Change-Id: I9a46512283d33e863c429840b465855d1fabb74e
2014-09-30 11:28:18 -07:00
Elliott Hughes
960e83185e
Use strerror(3) when reporting zygote failures.
...
Bug: 17700596
Change-Id: I39a72ab6f19063de3c90c9fccdb749dc9a86324e
2014-09-30 08:49:01 -07:00
jgu21
208678718f
Frameworks/base: Early init native bridge
...
Add the app directory to the arguments for starting a process.
Add a check for NeedsNativeBridge and a call to PreInitializeBridge
in the native fork code.
(cherry picked from commit 2eacd06bfb82b33dfcbccafbcfc0bf1218484bb5)
Bug: 17671501
Change-Id: I970db5b284b0c12e2d8a45df3950c1fff2927a4e
2014-09-28 15:35:59 -07:00
Ruben Brunk
469a55eddc
am 6f34ad71: Merge "camera2: Fix native ImageReader test segfaults." into lmp-dev
...
* commit '6f34ad71cb00c7f4260dbf071422b334152a2cd1':
camera2: Fix native ImageReader test segfaults.
2014-09-27 02:46:41 +00:00
Ruben Brunk
7b28c66a6c
Merge "camera2: Fix native ImageReader test segfaults." into lmp-dev
2014-09-27 02:16:30 +00:00
Ruben Brunk
31798f3318
camera2: Fix native ImageReader test segfaults.
...
Bug: 17675571
- Check for JPEG footer in correct location from ImageReader
when using the RGBA override.
- Add additional error checks in produceFrame method.
- Avoid allocating extra space for jpeg buffers due to
incorrect width calculations.
Change-Id: I926f37e8b3e5c4bad24c16dcee48d52adb1706dd
2014-09-26 18:00:21 -07:00
Dave Burke
aef681506c
am e09e20ee: Merge "Revert "Fix memory leak where we close the descriptor instead of the file."" into lmp-dev
...
* commit 'e09e20eeca4b822855e02507a4e30387ea4ee1a6':
Revert "Fix memory leak where we close the descriptor instead of the file."
2014-09-26 19:44:16 +00:00
Dave Burke
6bf7be3b75
Merge "Revert "Fix memory leak where we close the descriptor instead of the file."" into lmp-dev
2014-09-26 19:33:27 +00:00
Jérôme Poichet
d29c902f98
Revert "Fix memory leak where we close the descriptor instead of the file."
...
This reverts commit 1503ebd95fc82b1ae6ec8b006e62a9f6109973fa.
Change-Id: Id40cf34821ea244b1a838079bd147bc845b96cb3
2014-09-26 18:59:11 +00:00
Dianne Hackborn
042b32c8d2
am 0b1eb9d4: Merge "Work on issue #17656716 : Unhandled exception in Window Manager" into lmp-dev
...
* commit '0b1eb9d4ae339629fbbf226160896a917cad4d0d':
Work on issue #17656716 : Unhandled exception in Window Manager
2014-09-26 01:24:14 +00:00
Dianne Hackborn
017c6a28be
Work on issue #17656716 : Unhandled exception in Window Manager
...
Create descriptive errors when sending unreasonably large
parcels through IPC.
Change-Id: Ie93b5372a8ed87541db282876c4eeeae69a1e8bd
2014-09-25 17:48:44 -07:00
Dan Albert
e08bd64184
Allow AOSP to boot.
...
HAVE_OOM_ADJ is really __linux__, and this code should never be run on
another platform.
Bug: 17641445
Change-Id: Ib8174106b6d03c9c2429794a4f582c09cb308646
2014-09-25 11:48:11 -07:00
Ruben Brunk
bc167acc25
am 8acfdc7b: Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-dev
...
* commit '8acfdc7bf6b8ee5250351723ab2eef28f2b71e51':
camera2: Hide JPEGs in RGBA gralloc buffers.
2014-09-24 23:01:08 +00:00
Ruben Brunk
81ba98619b
Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-dev
2014-09-24 22:51:55 +00:00
Andreas Gampe
a103ebed6e
resolved conflicts for merge of dfdabe37 to lmp-dev-plus-aosp
...
Change-Id: Ia9c350dcfb41f9d04400a86bd7e5f2cf2af656f1
2014-09-24 15:38:02 -07:00
Andreas Gampe
6f954cf2eb
Merge "Frameworks/base: Early init native bridge"
2014-09-24 21:59:51 +00:00
Derek Sollenberger
899a28b28e
am c37e905a: Merge "Fix memory leak where we close the descriptor instead of the file." into lmp-dev
...
* commit 'c37e905a245e3134a417677b93d5a020bab62d75':
Fix memory leak where we close the descriptor instead of the file.
2014-09-24 20:34:01 +00:00
Derek Sollenberger
a14ec04b1e
Merge "Fix memory leak where we close the descriptor instead of the file." into lmp-dev
2014-09-24 20:21:55 +00:00
Mathieu Chartier
72536f1de9
am a061388d: Merge "Fix dalvik map names" into lmp-dev
...
* commit 'a061388d3f230072661c55fcb4158f383fd9fe94':
Fix dalvik map names
2014-09-24 19:38:10 +00:00
Mathieu Chartier
544300db17
Merge "Fix dalvik map names" into lmp-dev
2014-09-24 19:30:38 +00:00
Mathieu Chartier
eee9764418
Fix dalvik map names
...
Some maps which should have been dalvik other were incorrectly
accounted for in dalvik heap.
Bug: 17632563
Change-Id: I90d0bebf700650a445b19c4c72674b2941868d8b
2014-09-24 11:55:31 -07:00
Ruben Brunk
0fd198ad89
camera2: Hide JPEGs in RGBA gralloc buffers.
...
Bug: 17379185
- WAR for SW Write usage flags being unavailable on
certain devices for JPEG (blob) format buffers.
Change-Id: Ic7299785b743f35dd47264b9d1cea01a88b71d91
2014-09-24 10:43:12 -07:00
Derek Sollenberger
1b99187253
Fix memory leak where we close the descriptor instead of the file.
...
bug: 17541634
Change-Id: I842176213e0547dd737ef6e0b83c320a5cc32219
2014-09-24 09:32:37 -04:00
Eric Laurent
c1aa0838c8
am 337f4b98: am ee99d080: Merge "AudioRecord: add HW hotword capture flag" into lmp-dev
...
* commit '337f4b982e2405499270f4ea13abfa3cb221d3c6':
AudioRecord: add HW hotword capture flag
2014-09-24 02:35:45 +00:00
Eric Laurent
c1823452ad
Merge "AudioRecord: add HW hotword capture flag" into lmp-dev
2014-09-24 01:39:35 +00:00
jgu21
2eacd06bfb
Frameworks/base: Early init native bridge
...
Add the app directory to the arguments for starting a process.
Add a check for NeedsNativeBridge and a call to PreInitializeBridge
in the native fork code.
Change-Id: I0b93da93251c6b4638de786bf98cf99df07c3fc2
2014-09-22 16:04:37 -07:00
Christopher Ferris
5684e714a4
am 7d113829: am b6f891c4: Merge "Remove MALLOC_LEAK_CHECK references."
...
* commit '7d1138298b37bca2340fc4610090b53f5b838f7a':
Remove MALLOC_LEAK_CHECK references.
2014-09-20 01:03:08 +00:00
Eric Laurent
bdad1afa92
AudioRecord: add HW hotword capture flag
...
Bug: 17575019.
Change-Id: Ifa8b8342dffa12e1943b8f9105f6ab1fa4a2b1a6
2014-09-19 17:43:29 -07:00
Dan Albert
c04d92cac9
resolved conflicts for merge of 1a4527ce to lmp-dev-plus-aosp
...
Change-Id: Iee4e93e3a2b049ec5f13166dbbffdd77b301fe5c
2014-09-19 15:57:26 -07:00
Christopher Ferris
8b1dfddf50
Remove MALLOC_LEAK_CHECK references.
...
Bug: 17378595
Change-Id: Ib9680ef97dfea6bc20d96f0bed90f4553186315c
2014-09-19 12:24:59 -07:00
Mike Lockwood
99f8f21c16
am d3d6ecdb: am 52e5e359: Merge "USB string descriptors are not UTF8, so it is not safe to treat them as such." into lmp-dev
...
* commit 'd3d6ecdb7a6b00347920c5e706275017854849af':
USB string descriptors are not UTF8, so it is not safe to treat them as such.
2014-09-19 03:56:19 +00:00
Mike Lockwood
51938c205f
Merge "USB string descriptors are not UTF8, so it is not safe to treat them as such." into lmp-dev
2014-09-19 02:00:26 +00:00
Jorim Jaggi
0768029b74
am d2420d39: am ac980443: Merge "Use RenderThread for navigation bar ripples" into lmp-dev
...
* commit 'd2420d39c03c17ec62b283e5a99c33ff1360926f':
Use RenderThread for navigation bar ripples
2014-09-16 18:13:46 +00:00
Jorim Jaggi
072707dfad
Use RenderThread for navigation bar ripples
...
Bug: 17506181
Change-Id: Icf3b80f8c4bc29fe85313381d4019dda3ef85ea9
2014-09-16 17:51:55 +00:00
Alan Viverette
0cfc7717aa
am 5dee9c9b: am 855fc8c7: Update icons to vectors, fix preload theming & vector tinting
...
* commit '5dee9c9b3e68e7567e765b7abb5ba3d3f05ce989':
Update icons to vectors, fix preload theming & vector tinting
2014-09-12 20:52:03 +00:00
Alan Viverette
607bd84826
Update icons to vectors, fix preload theming & vector tinting
...
Adds a missing JNI binding to AssetManager, ensures drawables have
default tint modes as documented, and updates vector tint appropriately
when state changes.
BUG: 17385604
Change-Id: Ice92885989ebc13b95952f5dc3b7904cc956da12
2014-09-12 13:06:45 -07:00
Jeff Brown
c846e61639
am a38e59b1: am 683872af: Merge "Clean entire arg block when setting process name." into lmp-dev
...
* commit 'a38e59b1b4164a33c38fc522e56601d886c49833':
Clean entire arg block when setting process name.
2014-09-12 05:45:07 +00:00
George Mount
71fb032b65
am 217e34d0: am 51d20c87: Merge "Allow Path approximation to work with a single point Path." into lmp-dev
...
* commit '217e34d0fb9e3ae7e6b6e4bd8afb9a3d449989e5':
Allow Path approximation to work with a single point Path.
2014-09-12 05:44:46 +00:00
Dan Albert
88ba339aef
Clean up makefile cruft.
...
The build system already takes care of all these things.
Change-Id: Idef80b554e07cef5e5ed2adf1b5740a76f13ef6d
2014-09-11 16:21:19 -07:00