OSDN Git Service
The Android Automerger [Wed, 1 Jul 2015 21:24:01 +0000 (14:24 -0700)]
merge in mnc-release history after reset to mnc-dev
Amith Dsouza [Wed, 1 Jul 2015 17:44:57 +0000 (17:44 +0000)]
Merge "Revert "Revert "Modify EGL to disconnect the window when the surface gets destroyed.""" into mnc-dev
Aravind Akella [Wed, 1 Jul 2015 17:40:07 +0000 (17:40 +0000)]
Merge "Enable sensor data injection mode through adb." into mnc-dev
Amith Dsouza [Wed, 1 Jul 2015 05:54:16 +0000 (22:54 -0700)]
Revert "Revert "Modify EGL to disconnect the window when the surface gets destroyed.""
This reverts commit
6e1a2fea67006b58e83ebbcc72f7b12f18c49d15.
Driver level issues fixed by an updated graphics driver.
Bug:
21266976
Change-Id: I93339fb6c6bab988f3550adb49ef8e70cda6473e
Aravind Akella [Mon, 29 Jun 2015 19:37:48 +0000 (12:37 -0700)]
Enable sensor data injection mode through adb.
Change-Id: I415cf8ff0871fa74babaf9b879c68f210298b472
Chad Brubaker [Tue, 30 Jun 2015 21:03:55 +0000 (14:03 -0700)]
Fix writeByteArray/writeInt32Array size on x64
writeByteArray writes the size using sizeof(size_t), however it is always
read using readInt32(). On devices where sizeof(size_t) != 4 this causes
extra bytes to be written.
BUG:
22204736
Change-Id: I8d4507b6b616857ef5827f1fe9da0907d09abf0e
Daichi Hirono [Wed, 24 Jun 2015 06:57:06 +0000 (15:57 +0900)]
Fix directory path of codecache.
Previously installd removed the normal cache directory when delete_code_cache is
called. It should delete the code cache directory.
BUG=
21206499
Change-Id: I5774430e389e22805fa7984b4c83420c3677ca75
Daichi Hirono [Tue, 30 Jun 2015 04:01:51 +0000 (04:01 +0000)]
Merge "Fix directory path of codecache." into mnc-dev
Michael Wright [Mon, 29 Jun 2015 17:10:45 +0000 (17:10 +0000)]
Merge "Send cancelation events to monitors when injection fails." into mnc-dev
The Android Automerger [Sat, 27 Jun 2015 08:03:16 +0000 (01:03 -0700)]
merge in mnc-release history after reset to mnc-dev
Dan Stoza [Fri, 26 Jun 2015 19:37:23 +0000 (19:37 +0000)]
Merge "libgui: Fix handling of rotated surface damage" into mnc-dev
Lajos Molnar [Fri, 26 Jun 2015 03:35:55 +0000 (03:35 +0000)]
Merge "omx: add OMX_IndexParamConsumerUsageBits" into mnc-dev
Anthony Hugh [Fri, 26 Jun 2015 02:22:50 +0000 (02:22 +0000)]
am
209ea40e: (-s ours) am
9e415d71: DO NOT MERGE: Introduce stem keycodes for Wear
* commit '
209ea40e8f3ccda405cd4e99c768b9b9b43e9dfa':
DO NOT MERGE: Introduce stem keycodes for Wear
Adam Lesinski [Fri, 26 Jun 2015 02:22:49 +0000 (02:22 +0000)]
am
d2fb7a6e: am
8728c390: am
2c4f5fde: am
861c3f56: am
9004e7f5: am
4ff0cb44: Verify that the native handle was created
* commit '
d2fb7a6e49f04182ba7b639c340414b1745137f2':
Verify that the native handle was created
Lajos Molnar [Thu, 25 Jun 2015 23:57:17 +0000 (16:57 -0700)]
omx: add OMX_IndexParamConsumerUsageBits
This is used by framework to query buffer consumers (e.g. video encoders)
about required usage bits.
Bug:
13222807
Change-Id: I508335c9d753c7a7224bb882f2228bd2f4144031
Dan Stoza [Thu, 25 Jun 2015 23:10:18 +0000 (16:10 -0700)]
libgui: Fix handling of rotated surface damage
Incoming surface damage was not aware that the EGL implementation was
rotating buffers in response to SurfaceFlinger's transform hint. This
didn't affect all cases because the effect was to apply a 90 degree
rotation instead of a 270 degree rotation. For full-screen updates,
things more or less worked, but in other cases this caused corruption.
This fixes that by correctly undoing the effect of rotated buffers on
the incoming surface damage, and then passing that damage down
untouched to HWC.
Bug:
22068334
Change-Id: I226ecfc7a91fe2e16edd2aa6d9149f0d26b529d6
Anthony Hugh [Thu, 25 Jun 2015 01:27:44 +0000 (01:27 +0000)]
am
9e415d71: DO NOT MERGE: Introduce stem keycodes for Wear
* commit '
9e415d719e4ceb7a3e93c0d60f9c3bf9ee4fc97f':
DO NOT MERGE: Introduce stem keycodes for Wear
Anthony Hugh [Tue, 23 Jun 2015 17:49:05 +0000 (10:49 -0700)]
DO NOT MERGE: Introduce stem keycodes for Wear
Cherry-pick from master
This change adds four new stem keycodes for Android Wear. These
keycodes are intended to represent the various hardware buttons
around the watch. There is one primary stem key that will be used
for power/settings and three generic stem keys that will be
customizable.
BUG:
21903503
Change-Id: I762b8c0bcf3780a1756f4c1b8bbf07a039ba7781
Aravind Akella [Wed, 24 Jun 2015 15:31:32 +0000 (08:31 -0700)]
Fix crash in SensorService. Ignore devices with no sensors.
Change-Id: I1491740baa6348f97c336b6883b11ad2ab93cf73
Aravind Akella [Wed, 24 Jun 2015 15:34:59 +0000 (15:34 +0000)]
Merge "Fix crash in SensorService. Ignore devices with no sensors." into mnc-dev
Aravind Akella [Wed, 24 Jun 2015 15:31:32 +0000 (08:31 -0700)]
Fix crash in SensorService. Ignore devices with no sensors.
Change-Id: I1491740baa6348f97c336b6883b11ad2ab93cf73
The Android Automerger [Wed, 24 Jun 2015 09:53:29 +0000 (02:53 -0700)]
merge in mnc-release history after reset to mnc-dev
Daichi Hirono [Wed, 24 Jun 2015 06:57:06 +0000 (15:57 +0900)]
Fix directory path of codecache.
Previously installd removed the normal cache directory when delete_code_cache is
called. It should delete the code cache directory.
BUG=
21206499
Change-Id: I5774430e389e22805fa7984b4c83420c3677ca75
Dan Stoza [Tue, 23 Jun 2015 15:44:08 +0000 (15:44 +0000)]
Merge "libgui/SF: Propagate SECURE Layer flag changes" into mnc-dev
Michael Wright [Tue, 23 Jun 2015 12:49:28 +0000 (12:49 +0000)]
Merge "Add new AINPUT_SOURCE_BLUETOOTH_STYLUS" into mnc-dev
Michael Wright [Tue, 23 Jun 2015 12:48:52 +0000 (12:48 +0000)]
Merge "Add method to set action button on MotionEvent" into mnc-dev
The Android Automerger [Tue, 23 Jun 2015 08:04:19 +0000 (01:04 -0700)]
merge in mnc-release history after reset to mnc-dev
Aravind Akella [Mon, 22 Jun 2015 18:17:38 +0000 (18:17 +0000)]
Merge "More information in sensor bugreports." into mnc-dev
David Srbecky [Thu, 28 May 2015 15:55:50 +0000 (16:55 +0100)]
Rename --include-cfi to --generate-debug-info.
This follows a change in dex2oat.
(cherry picked from commit
741a6ff2e264b96edbca3ac95e720b21c8e39382)
Bug:
21924613
Change-Id: I6b2df1668fdd09d82cfe86e6e51360b954b6c8a9
Andreas Gampe [Fri, 24 Apr 2015 21:30:04 +0000 (14:30 -0700)]
Installd: Add debug.gencfi to run_dex2oat
Add the debug.gencfi system property that forces generation of
CFI data.
(cherry picked from commit
816243d470bade03c264e67e39590f6852581898)
Bug:
21924613
Change-Id: Ida66f8c1567634d05cfdbba1a982be3684e94369
Dan Stoza [Thu, 18 Jun 2015 21:58:39 +0000 (14:58 -0700)]
libgui/SF: Propagate SECURE Layer flag changes
This allows changes to the SECURE flag to propagate down to
Layers in SurfaceFlinger so that WindowManager can change it on the fly
in response to device policy updates.
Bug:
20934462
Change-Id: I558f6d22c6273be373f1f480365e42536af18a33
Aravind Akella [Thu, 18 Jun 2015 21:18:28 +0000 (14:18 -0700)]
More information in sensor bugreports.
i) Log last 20 activations/deactivations of sensors.
ii) Increase logging upto 50 events for accelerometer, step_counter and significant motion.
Change-Id: I3966ed0abda8b705f3d16e94a9370fa1b97baa57
Michael Wright [Wed, 17 Jun 2015 20:06:54 +0000 (21:06 +0100)]
Add method to set action button on MotionEvent
Change-Id: I09f00fa1c2b793a88772f67fe195860ec436179d
The Android Automerger [Tue, 16 Jun 2015 08:03:06 +0000 (01:03 -0700)]
merge in mnc-release history after reset to mnc-dev
The Android Automerger [Mon, 15 Jun 2015 18:58:15 +0000 (11:58 -0700)]
merge in mnc-release history after reset to mnc-dev
Mark Salyzyn [Fri, 12 Jun 2015 19:28:24 +0000 (12:28 -0700)]
dumpstate: modify logcat timeout to compensate for storage speed
(cherry pick from commit
f989162bb89dff6387f2021101306a1be6d875f7)
Discover the logcat buffer size, divide by the worst storage
speed in kb/s, and multiply by ten to estimate the timeout in
ms for each named buffer. If that value is less than 20 seconds,
then select 20 seconds. Apply this to each logcat request.
Bug:
21555259
Change-Id: Id36aebff83cb06e94350e4a84fa266b66a8444fc
The Android Automerger [Sat, 13 Jun 2015 08:04:13 +0000 (01:04 -0700)]
merge in mnc-release history after reset to mnc-dev
Sharvil Nanavati [Fri, 12 Jun 2015 21:30:02 +0000 (21:30 +0000)]
Merge "Remove Bluedroid kernel dump from dumpstate." into mnc-dev
Sharvil Nanavati [Fri, 12 Jun 2015 18:35:24 +0000 (11:35 -0700)]
Remove Bluedroid kernel dump from dumpstate.
Bluedroid doesn't have much of a kernel component and no devices
expose a bluedroid node in debugfs.
Change-Id: I5600e88c543a109257d95591704a8f2a7261dfdc
Manoj Kumar AVM [Thu, 11 Jun 2015 21:18:14 +0000 (14:18 -0700)]
sf: Fix incorrect state reporting in dumpsys
Dumpsys utility accesses layer compositionType variable
with out proper protection. These variables are modified
during hwc_prepare call. Existing HAL lock protection is not
sufficient to address this issue. Failure to do this will
result in incorrect state reporting in dumpsys.
A new displayLock mutex in HWComposer will be used in both
dumpsys and draw calls to ensure correct state is accessed.
Change-Id: I8a57de59525adc0e089b3bed95c067c01e42b666
(cherry picked from commit
e54506b81a3b81683056ad48294e37d6b4b4e36b)
Michael Wright [Fri, 12 Jun 2015 14:25:08 +0000 (15:25 +0100)]
Add new AINPUT_SOURCE_BLUETOOTH_STYLUS
Bug:
21531826
Change-Id: I3792860ad3f6579ceb50ccaa212f8fbd471a9b6b
Michael Wright [Fri, 12 Jun 2015 12:25:11 +0000 (13:25 +0100)]
Send cancelation events to monitors when injection fails.
Bug:
20649729
Change-Id: I46cd14ac1f040d404c0b1581b38fa07a944e5fb9
Tatenda Chipeperekwa [Wed, 29 Oct 2014 23:47:19 +0000 (16:47 -0700)]
sf: Add a NULL check in getDisplayConfigs
Validate the display binder by adding a NULL check in getDisplayConfigs.
This will prevent a false match if the caller queries the display
configs for an inactive display (whose binder is NULL by default).
Without this change we might end up attempting to index the display
config array, which is unpopulated for inactive displays, and this will
result in a crash. (See getDisplayInfo in SurfaceComposerClient.cpp for
an example of this scenario)
Change-Id: I1a12f43b7c375b9c01998dadd5b658275c733fb2
(cherry picked from commit
ac71c26e9180d9d181be5ec9e45da72d39144a8b)
Dan Stoza [Thu, 11 Jun 2015 17:12:49 +0000 (17:12 +0000)]
Merge "GLConsumer: Fix crop math" into mnc-dev
The Android Automerger [Thu, 11 Jun 2015 08:02:08 +0000 (01:02 -0700)]
merge in mnc-release history after reset to mnc-dev
Chris Craik [Wed, 10 Jun 2015 23:48:13 +0000 (23:48 +0000)]
Merge "Add tracing header" into mnc-dev
Aravind Akella [Wed, 10 Jun 2015 22:56:26 +0000 (22:56 +0000)]
Merge "Use LOCATION_HARDWARE permission for data injection." into mnc-dev
Aravind Akella [Wed, 10 Jun 2015 22:15:57 +0000 (15:15 -0700)]
Use LOCATION_HARDWARE permission for data injection.
Change-Id: Ie81cb0d5f537d5431f2127891cca1d39c969ee7b
Chris Craik [Wed, 10 Jun 2015 00:28:05 +0000 (17:28 -0700)]
Add tracing header
bug:
21195272
Change-Id: I520de9fee7fc40d0570d6bef450d756ce42a1462
Dan Stoza [Wed, 10 Jun 2015 17:28:32 +0000 (17:28 +0000)]
Merge "SF: Swap w/h when capturing rotated screenshots" into mnc-dev
Christopher Tate [Wed, 10 Jun 2015 17:26:43 +0000 (17:26 +0000)]
Merge "Prevent integer overflow when calculating buffer resizes" into mnc-dev
Dan Stoza [Tue, 9 Jun 2015 22:05:23 +0000 (15:05 -0700)]
GLConsumer: Fix crop math
When we have excess pixels that need to be removed from (for example)
the left and right sides, we currently do something like:
left += excess / 2;
right -= excess / 2;
If excess is odd, however, this removes 1 too few pixels since the odd
pixel gets rounded down twice. This changes the math to effectively:
left += excess / 2;
right -= (excess - excess / 2);
Which removes the correct total number of pixels.
Bug:
19611086
Change-Id: I8d1ad9fe7ba67c149794c148663d12acbccccef0
Michael Wright [Wed, 10 Jun 2015 17:08:01 +0000 (17:08 +0000)]
Merge "Only log dropped input when disabled for the first event." into mnc-dev
Michael Wright [Wed, 10 Jun 2015 14:26:13 +0000 (15:26 +0100)]
Only log dropped input when disabled for the first event.
Bug:
19851495
Change-Id: I8cb8076723c1ca1732c3bc37f283d8eb48b7bee0
The Android Automerger [Wed, 10 Jun 2015 08:02:12 +0000 (01:02 -0700)]
merge in mnc-release history after reset to mnc-dev
Dan Stoza [Tue, 9 Jun 2015 23:44:40 +0000 (16:44 -0700)]
SF: Swap w/h when capturing rotated screenshots
Swaps width and height when capturing a screenshot that is rotated by
90 or 270 degrees.
Bug:
8433742
Change-Id: Ibf0b604f541e3cc271e56fe0ad04dc366beb5d79
Erik Kline [Tue, 9 Jun 2015 23:24:53 +0000 (23:24 +0000)]
Merge "Incorporate network diagnostics during a bugreport" into mnc-dev
Narayan Kamath [Tue, 9 Jun 2015 11:31:01 +0000 (11:31 +0000)]
Merge "Add an installd command to link files" into mnc-dev
Narayan Kamath [Thu, 4 Jun 2015 12:20:27 +0000 (13:20 +0100)]
Add an installd command to link files
Given a pair of absolute paths {from_path, to_path} , check that
they are both valid apk subpaths (eg. /data/app/package/foo) and
link(2) to_path to from_path. This is required by staged installs,
where we link existing apks and oat files to their staging location.
bug:
20889739
Change-Id: I3b5e3b43677af68be59308121a4409caaa6a72f0
Erik Kline [Tue, 9 Jun 2015 08:38:12 +0000 (17:38 +0900)]
Incorporate network diagnostics during a bugreport
Bug:
21449922
Change-Id: I81a3774683c08f5d4ab4ea75bec45d279fb210ec
The Android Automerger [Tue, 9 Jun 2015 08:03:13 +0000 (01:03 -0700)]
merge in mnc-release history after reset to mnc-dev
Lajos Molnar [Tue, 9 Jun 2015 00:04:17 +0000 (00:04 +0000)]
Merge "media: change parameters for OMX_EventOutputRendered" into mnc-dev
Christopher Tate [Mon, 8 Jun 2015 21:45:14 +0000 (14:45 -0700)]
Prevent integer overflow when calculating buffer resizes
Make sure that we don't go haywire if an exponential buffer growth
operation winds up wrapping integer range. Along the way, fix a
bookkeeping bug in BufferedTextOutput that would cause it to keep
spuriously realloc()ing on every append().
Bug
20674694
Change-Id: Ia845b7de36b90672a151a918ffc26c7da68e20a2
Christopher Tate [Thu, 4 Jun 2015 01:44:15 +0000 (18:44 -0700)]
Don't corrupt parcel when writeFileDescriptor() fails
We now check for fd-legality before committing binder objects to
the flattened data buffer rather than after. Previously we would
wind up corrupting the parcel and incurring driver-level errors,
as well as potentially leaking FDs.
Bug
21428802
Change-Id: Ice0d641b3dcc41fb1b8c68ce2e2ebd744c2863a1
Dan Stoza [Mon, 8 Jun 2015 16:32:50 +0000 (09:32 -0700)]
libgui/SurfaceFlinger: Add getConsumerName
Adds a getConsumerName method to IGraphicBufferProducer and Surface.
Currently, the name is cached inside of IGBP and is update on connect
and dequeueBuffer, which should be good enough for most uses.
Bug:
6667401
Change-Id: I22c7881d778e495cf8276de7bbcd769e52429915
Dan Stoza [Mon, 8 Jun 2015 16:30:14 +0000 (16:30 +0000)]
Merge "Revert "libgui: Add getConsumerName"" into mnc-dev
Dan Stoza [Mon, 8 Jun 2015 16:30:08 +0000 (16:30 +0000)]
Revert "libgui: Add getConsumerName"
This reverts commit
107fbe5599016b0e35145a1a00c4f238b63d61e4.
Change-Id: I0c2b0f7c81193b05eb3dd2f5a59f83598434b744
Dan Stoza [Mon, 8 Jun 2015 16:21:03 +0000 (16:21 +0000)]
Merge "libgui: Add getConsumerName" into mnc-dev
The Android Automerger [Sat, 6 Jun 2015 08:03:39 +0000 (01:03 -0700)]
merge in mnc-release history after reset to mnc-dev
Lajos Molnar [Sat, 6 Jun 2015 00:49:25 +0000 (17:49 -0700)]
media: change parameters for OMX_EventOutputRendered
This allows batching of rendered events.
Bug:
20503131
Change-Id: I3b319317c0434eb225198f8c4bf716edf68079a2
Jeff Brown [Wed, 12 Nov 2014 00:44:25 +0000 (16:44 -0800)]
Enable more flexible usage of blobs in parcels.
Add functions to allow a client to take over the ashmem region
that was transferred so that it can claim it for its own and
reuse it.
Add support for mutable ashmem regions too.
Bug:
21428802
Change-Id: I16eca338cdb99b07d81fc43573d53ce86dbc60c8
Dan Stoza [Fri, 5 Jun 2015 22:01:58 +0000 (15:01 -0700)]
libgui: Add getConsumerName
Adds a getConsumerName method to IGraphicBufferProducer and Surface.
Currently, the name is cached inside of IGBP and is updated on connect
and dequeueBuffer, which should be good enough for most uses.
Bug:
6667401
Change-Id: Ife94bd89023fe7c00bad916932b9a19233fd2290
Dan Stoza [Fri, 5 Jun 2015 15:38:34 +0000 (15:38 +0000)]
Merge "libgui: Add generation numbers to BufferQueue" into mnc-dev
Dan Stoza [Fri, 5 Jun 2015 02:40:03 +0000 (19:40 -0700)]
SF: Don't crop surface damage against viewport
Apply the display transform to surface damage, but don't intersect it
with the viewport.
Bug:
21486007
Change-Id: I94e697cea52096a960385d5f3b89609fdcf30a02
Tim Kilbourn [Wed, 3 Jun 2015 18:25:56 +0000 (11:25 -0700)]
DO NOT MERGE Remove unused ParcelFileDescriptor methods in parcel.
Attempts to replicate Java parceling in native code is fraught with
peril.
Change-Id: I4359036c5dddd1b886d886beef1d060523e53e5f
(cherry picked from commit
f47a381001d4d4ce66c2e35aac5b96a26acc0730)
The Android Automerger [Thu, 4 Jun 2015 08:02:46 +0000 (01:02 -0700)]
merge in mnc-release history after reset to mnc-dev
Stephen Smalley [Wed, 3 Jun 2015 13:25:37 +0000 (09:25 -0400)]
Call selinux_status_open() prior to use of selinux_status_updated().
The selinux_status_*() interfaces require calling selinux_status_open()
first. Since this was not being called by servicemanager, the
selinux_status_updated() call was always failing and servicemanager
was not reloading service_contexts upon a policy reload.
(cherrypicked from commit
bea0746b241d15626cf0a56828efc1d4640dbda7)
Change-Id: I6ac62e114bbca99c5f0999feb918fcde15009274
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Dan Stoza [Tue, 2 Jun 2015 22:45:22 +0000 (15:45 -0700)]
libgui: Add generation numbers to BufferQueue
This change allows producers to set a generation number on a
BufferQueue. This number will be embedded in any new GraphicBuffers
created in that BufferQueue, and attempts to attach buffers which have
a different generation number will fail.
It also plumbs the setGenerationNumber method through Surface, with the
additional effect that any buffers attached to the Surface after
setting a new generation number will automatically be updated with the
new number (as opposed to failing, as would happen on through IGBP).
Bug:
20923096
Change-Id: I32bf726b035f99c3e5834beaf76afb9f01adcbc2
The Android Automerger [Wed, 3 Jun 2015 08:02:36 +0000 (01:02 -0700)]
merge in mnc-release history after reset to mnc-dev
Lajos Molnar [Wed, 3 Jun 2015 02:43:16 +0000 (19:43 -0700)]
media: rename VideoGrallocMetadata.hHandle to pHandle
This is so that it can be equivalent to the previously named
VideoDecoderOutputMetaData struct.
Bug:
13222807
Change-Id: I9463694f65436a7edb1f6b592efc0a6329232a27
The Android Automerger [Tue, 2 Jun 2015 08:02:20 +0000 (01:02 -0700)]
merge in mnc-release history after reset to mnc-dev
Lajos Molnar [Tue, 2 Jun 2015 04:13:47 +0000 (21:13 -0700)]
fix build: media: add back legacy name for VideoGrallocMetadata
Change-Id: Ie101eb355887072b2ab92f489b86115a40952bd1
Lajos Molnar [Tue, 2 Jun 2015 03:32:00 +0000 (03:32 +0000)]
Merge "media: refine kMetadataBufferTypes" into mnc-dev
Ruben Brunk [Tue, 2 Jun 2015 01:48:21 +0000 (01:48 +0000)]
Merge "Track camera and flashlight usage in battery stats." into mnc-dev
Christopher Tate [Tue, 2 Jun 2015 01:05:46 +0000 (01:05 +0000)]
Merge "Disregard alleged binder entities beyond parcel bounds" into mnc-dev
Ruben Brunk [Wed, 27 May 2015 00:30:11 +0000 (17:30 -0700)]
Track camera and flashlight usage in battery stats.
Bug:
15986092
Change-Id: I272ec070113a0bfc41c637c45a6e1a2ab346e87b
Dan Stoza [Mon, 1 Jun 2015 20:59:15 +0000 (13:59 -0700)]
libgui: Propagate error by clearing sp<GB>
Clears the sp<GraphicBuffer> returned by createGraphicBuffer when there
is an error during unflattening.
Bug:
21498231
Change-Id: I886da4474fc06853cc59188d62044b7d7549126b
Dan Stoza [Mon, 1 Jun 2015 16:30:46 +0000 (16:30 +0000)]
Merge "SF: Reduce resync samples without present" into mnc-dev
Dan Stoza [Mon, 1 Jun 2015 16:30:31 +0000 (16:30 +0000)]
Merge "libui: Apply GRALLOC_USAGE_ALLOC_MASK during alloc" into mnc-dev
The Android Automerger [Sat, 30 May 2015 08:04:15 +0000 (01:04 -0700)]
merge in mnc-release history after reset to mnc-dev
Lajos Molnar [Sat, 16 May 2015 03:31:57 +0000 (20:31 -0700)]
media: refine kMetadataBufferTypes
- Fix kMetadataBufferTypeANWBuffer, so that it only relies on
system/core structures. This resolves potential linker issues if
the framework changes.
- Add fence to be passed with kMetadataBufferTypeANWBuffer.
- Add utility structures to access the metadata buffer layouts.
Related-bug:
19614055
Bug:
13222807
Bug:
12386081
Change-Id: I608958fd394b08cc3396bcbd5cdd350b87bc66f3
Michael Lentine [Fri, 29 May 2015 23:05:36 +0000 (16:05 -0700)]
Fix libgui crop matrix test.
On devices that have the crop image extension the crop is not applied to the
transform matrix so we have to expect different results in this case.
Change-Id: If62dec1111fb77c9fa2c4332d121665960ce0216
Dan Stoza [Fri, 29 May 2015 20:00:23 +0000 (13:00 -0700)]
SF: Reduce resync samples without present
Reduces the number of resync samples that DispSync will attempt to
collect without an intervening present from 12 to 4. The former value
was causing excessive power draw for some vendors' implementations, and
reducing it doesn't seem to harm anything.
Bug:
20724456
Change-Id: Ifd6e0490be67756ed001d509a38e8a36953b4618
Dan Stoza [Fri, 29 May 2015 19:48:04 +0000 (12:48 -0700)]
libui: Apply GRALLOC_USAGE_ALLOC_MASK during alloc
Applies GRALLOC_USAGE_ALLOC_MASK to the incoming usage bits before
calling alloc on the gralloc module. This filters out the new flag
GRALLOC_USAGE_FOREIGN_BUFFERS, which is used to send a hint to the
producer, but which does not affect the allocation of buffers.
Bug:
19801661
Change-Id: Ia37a3eddba2e97598e50ac3e10877430adfa9247
Michael Lentine [Fri, 29 May 2015 00:43:06 +0000 (17:43 -0700)]
Check that width and height parameters are small.
The product of width and height should be less than UINT32_MAX (in practice
smaller). Adding the checks prevents overflows when allocating buffers.
Bug:
20726612
Change-Id: I9769edf0688a9bfe69906d49fa0540cadf4c49b0
Michael Lentine [Thu, 28 May 2015 23:48:08 +0000 (16:48 -0700)]
Revert "Modify EGL to disconnect the window when the surface gets destroyed."
This reverts commit
00699fa64197cc72a160d69e1f0003cdd43dc136.
Michael Lentine [Thu, 28 May 2015 23:48:08 +0000 (16:48 -0700)]
Revert "Modify EGL to disconnect the window when the surface gets destroyed."
This reverts commit
00699fa64197cc72a160d69e1f0003cdd43dc136.
Alistair Strachan [Fri, 22 May 2015 21:10:09 +0000 (14:10 -0700)]
Fix EGL shim extension injection for GL ES 3 drivers.
The Android EGL shim injects GL_EXT_debug_marker into the ES driver
EXTENSIONS string for the OpenGL ES 1.x and 2.0/3.0/3.1 drivers if
the extension is not already provided. This feature is used by
GLES_trace.
In Open GL ES 3.0 it became possible to query an indexed version of
the EXTENSIONS string via GetStringi(). NUM_EXTENSIONS Gets were
also added to the specification (taken from Open GL).
If the shim does not have to inject the extension, then there is no
problem, as glGetString() and glGetStringi() / NUM_EXTENSIONS will
be consistent. However, if the Android EGL shim injects the
extension, NUM_EXTENSIONS and GetStringi() will report one less
extension than is really available.
Consistency between these methods is tested by the dEQP framework
with the dEQP-GLES3.functional.state_query.string.extensions test.
If the driver does not provide GL_EXT_debug_marker, this test
fails.
This change wraps all of the affected entry points so that the
wrapped driver extensions are never visible directly to dEQP,
eliminating the inconsistency.
Adam Lesinski [Thu, 28 May 2015 22:30:05 +0000 (22:30 +0000)]
am
8728c390: am
2c4f5fde: am
861c3f56: am
9004e7f5: am
4ff0cb44: Verify that the native handle was created
* commit '
8728c390476110857dd6b290dac3bfdf13b33e81':
Verify that the native handle was created
Adam Lesinski [Thu, 28 May 2015 21:44:36 +0000 (21:44 +0000)]
am
2c4f5fde: am
861c3f56: am
9004e7f5: am
4ff0cb44: Verify that the native handle was created
* commit '
2c4f5fdeca8e7a6f672bbcb8c25e6b81bf4eaa5b':
Verify that the native handle was created