OSDN Git Service
Sharvil Nanavati [Fri, 12 Jun 2015 21:52:23 +0000 (21:52 +0000)]
am
94a9875f: Merge "Remove Bluedroid kernel dump from dumpstate." into mnc-dev
* commit '
94a9875f7565617a000814039a4134420397a6aa':
Remove Bluedroid kernel dump from dumpstate.
Sharvil Nanavati [Fri, 12 Jun 2015 21:30:02 +0000 (21:30 +0000)]
Merge "Remove Bluedroid kernel dump from dumpstate." into mnc-dev
Dan Stoza [Fri, 12 Jun 2015 20:05:27 +0000 (20:05 +0000)]
am
0501cdbc: am
2b5b55e7: Merge "sf: Fix incorrect state reporting in dumpsys"
* commit '
0501cdbc0431f50eb22cc761dbdcbc3975005a70':
sf: Fix incorrect state reporting in dumpsys
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 [Fri, 12 Jun 2015 17:31:23 +0000 (17:31 +0000)]
am
e04e4edc: sf: Fix incorrect state reporting in dumpsys
* commit '
e04e4edcd1a852058775caa34cf73e2c20dc1066':
sf: Fix incorrect state reporting in dumpsys
Dan Stoza [Fri, 12 Jun 2015 17:00:44 +0000 (17:00 +0000)]
am
2b5b55e7: Merge "sf: Fix incorrect state reporting in dumpsys"
* commit '
2b5b55e73c79658b9a0ae3fdf347f6dbe65e3c68':
sf: Fix incorrect state reporting in dumpsys
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)
Dan Stoza [Fri, 12 Jun 2015 16:47:21 +0000 (16:47 +0000)]
Merge "sf: Fix incorrect state reporting in dumpsys"
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
Dan Stoza [Thu, 11 Jun 2015 19:54:23 +0000 (19:54 +0000)]
am
25a83393: am
85e271d0: Merge "sf: Add a NULL check in getDisplayConfigs"
* commit '
25a83393e6a49b136eb7b58eb2f0b3f00b915f2e':
sf: Add a NULL check in getDisplayConfigs
Dan Stoza [Thu, 11 Jun 2015 19:40:31 +0000 (19:40 +0000)]
am
85e271d0: Merge "sf: Add a NULL check in getDisplayConfigs"
* commit '
85e271d051770fdd5bb1bb017255f735cbd45459':
sf: Add a NULL check in getDisplayConfigs
Dan Stoza [Thu, 11 Jun 2015 19:31:43 +0000 (19:31 +0000)]
Merge "sf: Add a NULL check in getDisplayConfigs"
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: Ib32a7dc8378d3438df0dba1ecd608bbcfc837717
Tatenda Chipeperekwa [Thu, 11 Jun 2015 18:57:28 +0000 (18:57 +0000)]
am
23e16bb5: sf: Add a NULL check in getDisplayConfigs
* commit '
23e16bb5dae277cd20a739ca56553ae931c43ccf':
sf: Add a NULL check in getDisplayConfigs
Dan Stoza [Thu, 11 Jun 2015 18:01:37 +0000 (18:01 +0000)]
am
35710ab0: am
ffe3e96a: Merge "GLConsumer: Fix crop math"
* commit '
35710ab014b6ff4a914f00509ecb34737d37fb47':
GLConsumer: Fix crop math
Dan Stoza [Thu, 11 Jun 2015 17:47:58 +0000 (17:47 +0000)]
am
ffe3e96a: Merge "GLConsumer: Fix crop math"
* commit '
ffe3e96afe99e94904ca0c8f458a3eb708d78066':
GLConsumer: Fix crop math
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:34:15 +0000 (17:34 +0000)]
Merge "GLConsumer: Fix crop math"
Dan Stoza [Thu, 11 Jun 2015 17:32:56 +0000 (17:32 +0000)]
am
6cd8771c: Merge "GLConsumer: Fix crop math" into mnc-dev
* commit '
6cd8771c9cb9512e094bc2944bb7dd38665c1838':
GLConsumer: Fix crop math
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
(cherry picked from commit
ec4cb387502d5bd09e49b55605cf679fe3a0207a)
Dan Stoza [Thu, 11 Jun 2015 17:12:49 +0000 (17:12 +0000)]
Merge "GLConsumer: Fix crop math" into mnc-dev
Chris Craik [Thu, 11 Jun 2015 02:08:20 +0000 (02:08 +0000)]
am
8a4222a6: Merge "Add tracing header" into mnc-dev
* commit '
8a4222a647bd17c991959eca17a50ba911c3ab6b':
Add tracing header
Aravind Akella [Thu, 11 Jun 2015 02:08:19 +0000 (02:08 +0000)]
am
52720f45: Merge "Use LOCATION_HARDWARE permission for data injection." into mnc-dev
* commit '
52720f45098e9aed57c906e64a13e4a4a2173ce8':
Use LOCATION_HARDWARE permission for data injection.
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
Dan Stoza [Wed, 10 Jun 2015 20:36:51 +0000 (20:36 +0000)]
am
430f5f5a: am
127cf2ef: Merge "SF: Swap w/h when capturing rotated screenshots"
* commit '
430f5f5a6203cf6a4d688bc59a7082eb517533e3':
SF: Swap w/h when capturing rotated screenshots
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 18:21:55 +0000 (18:21 +0000)]
am
127cf2ef: Merge "SF: Swap w/h when capturing rotated screenshots"
* commit '
127cf2eff638a98c5318ba8b3edaf3ca651c4090':
SF: Swap w/h when capturing rotated screenshots
Dan Stoza [Wed, 10 Jun 2015 18:10:07 +0000 (18:10 +0000)]
Merge "SF: Swap w/h when capturing rotated screenshots"
Dan Stoza [Wed, 10 Jun 2015 17:52:50 +0000 (17:52 +0000)]
am
d177e044: Merge "SF: Swap w/h when capturing rotated screenshots" into mnc-dev
* commit '
d177e044d129bbecc3900a7fcd442b354de768df':
SF: Swap w/h when capturing rotated screenshots
Christopher Tate [Wed, 10 Jun 2015 17:52:50 +0000 (17:52 +0000)]
am
2560442a: Merge "Prevent integer overflow when calculating buffer resizes" into mnc-dev
* commit '
2560442a1ed7e21b9d941218d2e9e203626fa731':
Prevent integer overflow when calculating buffer resizes
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
(cherry picked from commit
3502416204d9dbd905012ee586d8bd145323809f)
Michael Wright [Wed, 10 Jun 2015 17:32:41 +0000 (17:32 +0000)]
am
043bd36b: Merge "Only log dropped input when disabled for the first event." into mnc-dev
* commit '
043bd36b0d50efa81d010c64009317af160d5fec':
Only log dropped input when disabled for the first event.
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
Erik Kline [Tue, 9 Jun 2015 23:47:36 +0000 (23:47 +0000)]
am
47a7dc81: Merge "Incorporate network diagnostics during a bugreport" into mnc-dev
* commit '
47a7dc81d0fedc1e85091f0e8a868768d0e8cadd':
Incorporate network diagnostics during a bugreport
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
Dan Stoza [Tue, 9 Jun 2015 20:56:34 +0000 (20:56 +0000)]
am
558f55c7: am
5ab3ba1e: Merge "SF: Don\'t crop surface damage against viewport"
* commit '
558f55c79874990cb629a02fd015eec445a20e44':
SF: Don't crop surface damage against viewport
Dan Stoza [Tue, 9 Jun 2015 20:40:48 +0000 (20:40 +0000)]
am
5ab3ba1e: Merge "SF: Don\'t crop surface damage against viewport"
* commit '
5ab3ba1e43e609c7a77cc780c888f666d153a4c9':
SF: Don't crop surface damage against viewport
Dan Stoza [Tue, 9 Jun 2015 20:28:59 +0000 (20:28 +0000)]
Merge "SF: Don't crop surface damage against viewport"
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
(cherry picked from commit
17833a1b0d70cd5cea342cadea9fdbbf16748bc6)
Dan Stoza [Tue, 9 Jun 2015 20:13:53 +0000 (20:13 +0000)]
am
837b9fb8: am
816c9e0e: Merge "libgui/SurfaceFlinger: Add getConsumerName"
* commit '
837b9fb87b0a8ea8a4ca680952b86e4d759723d0':
libgui/SurfaceFlinger: Add getConsumerName
Dan Stoza [Tue, 9 Jun 2015 20:13:52 +0000 (20:13 +0000)]
am
9a9bedc8: (-s ours) am
b169b49a: Merge "libgui: Add generation numbers to BufferQueue"
* commit '
9a9bedc815c98a55e9fb25107be5b9d74410b8cf':
libgui: Add generation numbers to BufferQueue
Dan Stoza [Tue, 9 Jun 2015 18:37:09 +0000 (18:37 +0000)]
am
816c9e0e: Merge "libgui/SurfaceFlinger: Add getConsumerName"
* commit '
816c9e0eab939322360da972569506ba19fafc74':
libgui/SurfaceFlinger: Add getConsumerName
Dan Stoza [Tue, 9 Jun 2015 18:37:08 +0000 (18:37 +0000)]
am
b169b49a: Merge "libgui: Add generation numbers to BufferQueue"
* commit '
b169b49aecdbf3424f334ac2b22c36a2988a8338':
libgui: Add generation numbers to BufferQueue
Dan Stoza [Tue, 9 Jun 2015 18:34:10 +0000 (18:34 +0000)]
Merge "libgui/SurfaceFlinger: Add getConsumerName"
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
(cherry picked from commit
c6f30bdee1f634eb90d68cb76efe935b6535a1e8)
Dan Stoza [Tue, 9 Jun 2015 18:23:48 +0000 (18:23 +0000)]
Merge "libgui: Add generation numbers to BufferQueue"
Narayan Kamath [Tue, 9 Jun 2015 13:01:30 +0000 (13:01 +0000)]
am
3d051856: Merge "Add an installd command to link files" into mnc-dev
* commit '
3d0518565a5e704dc8020a96c5bb3a96a093f4cd':
Add an installd command to link files
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
Lajos Molnar [Tue, 9 Jun 2015 00:29:41 +0000 (00:29 +0000)]
am
037d4ca3: Merge "media: change parameters for OMX_EventOutputRendered" into mnc-dev
* commit '
037d4ca35abbcf40e244a5d09bade6dd8b9b2b0b':
media: change parameters for OMX_EventOutputRendered
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 [Mon, 8 Jun 2015 21:32:58 +0000 (21:32 +0000)]
am
98e67d35: Don\'t corrupt parcel when writeFileDescriptor() fails
* commit '
98e67d352b8805a868ca0e7c2be3ea830fb7c338':
Don't corrupt parcel when writeFileDescriptor() fails
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 [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
(cherry picked from commit
812ed0644f8f8f71ca403f4e5793f0dbc1fcf9b2)
Dan Stoza [Mon, 8 Jun 2015 17:18:52 +0000 (17:18 +0000)]
am
c6f30bde: libgui/SurfaceFlinger: Add getConsumerName
* commit '
c6f30bdee1f634eb90d68cb76efe935b6535a1e8':
libgui/SurfaceFlinger: Add getConsumerName
Dan Stoza [Mon, 8 Jun 2015 17:04:11 +0000 (17:04 +0000)]
am
5b36ea44: Merge "Revert "libgui: Add getConsumerName"" into mnc-dev
* commit '
5b36ea44c58f8def561bf37c79d3452b21e2deab':
Revert "libgui: Add getConsumerName"
Dan Stoza [Mon, 8 Jun 2015 17:04:10 +0000 (17:04 +0000)]
am
5b23b5bf: Merge "libgui: Add getConsumerName" into mnc-dev
* commit '
5b23b5bf45b115d2c91448747ea40b63377d4abd':
libgui: Add getConsumerName
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
Jeff Brown [Sat, 6 Jun 2015 04:47:56 +0000 (04:47 +0000)]
am
13b16040: Enable more flexible usage of blobs in parcels.
* commit '
13b1604018968408bcc5553e1fa5ea9df3e4e009':
Enable more flexible usage of blobs in parcels.
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 16:00:13 +0000 (16:00 +0000)]
am
9d2c5a7c: Merge "libgui: Add generation numbers to BufferQueue" into mnc-dev
* commit '
9d2c5a7c678bd384df0fb29952cf8943e7b1b160':
libgui: Add generation numbers to BufferQueue
Dan Stoza [Fri, 5 Jun 2015 16:00:12 +0000 (16:00 +0000)]
am
17833a1b: SF: Don\'t crop surface damage against viewport
* commit '
17833a1b0d70cd5cea342cadea9fdbbf16748bc6':
SF: Don't crop surface damage against viewport
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 [Thu, 4 Jun 2015 23:07:56 +0000 (23:07 +0000)]
am
9e6d2ee0: DO NOT MERGE Remove unused ParcelFileDescriptor methods in parcel.
* commit '
9e6d2ee0302c6f6108488237821958c42ac380a1':
DO NOT MERGE Remove unused ParcelFileDescriptor methods in parcel.
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)
Stephen Smalley [Wed, 3 Jun 2015 21:21:01 +0000 (21:21 +0000)]
am
2139c7fa: Call selinux_status_open() prior to use of selinux_status_updated().
* commit '
2139c7fa37e581f6d2f573003afc16fbef700ad1':
Call selinux_status_open() prior to use of selinux_status_updated().
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>
Lajos Molnar [Wed, 3 Jun 2015 18:46:42 +0000 (18:46 +0000)]
am
d910f3cf: media: rename VideoGrallocMetadata.hHandle to pHandle
* commit '
d910f3cf78ae878b1b86ead7ca837004c3a25aaa':
media: rename VideoGrallocMetadata.hHandle to pHandle
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
Nick Kralevich [Wed, 3 Jun 2015 13:56:54 +0000 (13:56 +0000)]
am
1170bbe5: am
c19fdee3: Merge "Call selinux_status_open() prior to use of selinux_status_updated()."
* commit '
1170bbe56a3ebf94a6b25119826b1b57063896d0':
Call selinux_status_open() prior to use of selinux_status_updated().
Nick Kralevich [Wed, 3 Jun 2015 13:41:53 +0000 (13:41 +0000)]
am
c19fdee3: Merge "Call selinux_status_open() prior to use of selinux_status_updated()."
* commit '
c19fdee38a4715b0d642fc8673687715766307cc':
Call selinux_status_open() prior to use of selinux_status_updated().
Nick Kralevich [Wed, 3 Jun 2015 13:33:36 +0000 (13:33 +0000)]
Merge "Call selinux_status_open() prior to use of selinux_status_updated()."
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.
Change-Id: I6ac62e114bbca99c5f0999feb918fcde15009274
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
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
Lajos Molnar [Tue, 2 Jun 2015 14:24:21 +0000 (14:24 +0000)]
am
a8c2454d: fix build: media: add back legacy name for VideoGrallocMetadata
* commit '
a8c2454d52d3c23bd53b4a172eff8e5f4af30168':
fix build: media: add back legacy name for VideoGrallocMetadata
Lajos Molnar [Tue, 2 Jun 2015 14:24:14 +0000 (14:24 +0000)]
am
da7cbd8c: Merge "media: refine kMetadataBufferTypes" into mnc-dev
* commit '
da7cbd8c7c54c2c93ca7bc49b5218cf99825f9e4':
media: refine kMetadataBufferTypes
Ruben Brunk [Tue, 2 Jun 2015 14:23:55 +0000 (14:23 +0000)]
am
7e5bb370: Merge "Track camera and flashlight usage in battery stats." into mnc-dev
* commit '
7e5bb3701a313e539447c96ee2b31df62edc79fe':
Track camera and flashlight usage in battery stats.
Christopher Tate [Tue, 2 Jun 2015 14:23:27 +0000 (14:23 +0000)]
am
5a31f1ab: Merge "Disregard alleged binder entities beyond parcel bounds" into mnc-dev
* commit '
5a31f1abf69eaf4c25a84d53e318c0a716911786':
Disregard alleged binder entities beyond parcel bounds
Dan Stoza [Tue, 2 Jun 2015 14:21:15 +0000 (14:21 +0000)]
am
6a04e5fc: libgui: Propagate error by clearing sp<GB>
* commit '
6a04e5fcf67e754b215301fe38a6401db567f4b5':
libgui: Propagate error by clearing sp<GB>
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 22:21:41 +0000 (22:21 +0000)]
am
ae892959: am
8980e0cc: Merge "libgui: Propagate error by clearing sp<GB>"
* commit '
ae892959e45a93fea665cbb0ac01a99c95f44c10':
libgui: Propagate error by clearing sp<GB>