OSDN Git Service
Eino-Ville Talvala [Wed, 3 Dec 2014 18:54:28 +0000 (18:54 +0000)]
Revert "Camera: Add XML entries and files for new system features"
This reverts commit
e86d1091766b012da1f6616c7ec270d332baef95.
Bug:
18281970
Bug:
18573576
Change-Id: If1cf236ef7eabd15ffb2a5dd33d25a8acabdd14c
Dan Stoza [Wed, 3 Dec 2014 00:58:17 +0000 (16:58 -0800)]
SurfaceFlinger: Listen to HWC invalidate
"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
Michael Lentine [Tue, 25 Nov 2014 00:56:51 +0000 (00:56 +0000)]
Merge "Add clamp to Layer and update Transform inverse." into lmp-mr1-dev
Dianne Hackborn [Mon, 24 Nov 2014 17:53:55 +0000 (17:53 +0000)]
Merge "Work on issue #
18486438: Reduce size of bugreport output" into lmp-mr1-dev
Eino-Ville Talvala [Sat, 22 Nov 2014 04:57:51 +0000 (04:57 +0000)]
Merge "Camera: Add XML entries and files for new system features" into lmp-mr1-dev
Eino-Ville Talvala [Thu, 20 Nov 2014 23:37:51 +0000 (15:37 -0800)]
Camera: Add XML entries and files for new system features
Add BURST_CAPTURE and READ_SENSOR_SETTINGS.
Bug:
18281970
Change-Id: Ibf596c97fbca46f2ae044b6c87586d76605a5163
Michael Lentine [Thu, 20 Nov 2014 02:32:37 +0000 (18:32 -0800)]
Add clamp to Layer and update Transform inverse.
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
Dianne Hackborn [Sat, 22 Nov 2014 00:39:24 +0000 (16:39 -0800)]
Work on issue #
18486438: Reduce size of bugreport output
Don't put packages.xml in to the output.
Change-Id: I88a682866365886506a003a64deb4a29c16ba21c
Greg Hackmann [Fri, 21 Nov 2014 20:27:07 +0000 (20:27 +0000)]
Merge "atrace: make fs-specific sysfs entries optional" into lmp-mr1-dev
Greg Hackmann [Thu, 20 Nov 2014 20:59:44 +0000 (12:59 -0800)]
atrace: make fs-specific sysfs entries optional
The availability of these sysfs entries will vary based on the kernel's
supported filesystems, so don't block the disk category if some of them
are missing.
Bug:
18467498
Change-Id: I96200f1b5cf3f1a8fa8186602552adc96ddffc04
Signed-off-by: Greg Hackmann <ghackmann@google.com>
Lajos Molnar [Thu, 20 Nov 2014 06:44:41 +0000 (06:44 +0000)]
Merge "omx: add (temporary) index for automatic video frc support" into lmp-mr1-dev
Lajos Molnar [Thu, 6 Nov 2014 18:47:41 +0000 (10:47 -0800)]
omx: add (temporary) index for automatic video frc support
Bug:
17383204
Change-Id: I9b22da03ea3f2a7d9dd85042fff442d2414cbc26
Dan Stoza [Sat, 8 Nov 2014 00:00:59 +0000 (16:00 -0800)]
SurfaceFlinger: Do less work when using PTS
Currently, SurfaceFlinger is very dumb about how it handles buffer
updates at less than 60fps. If there is a new frame pending, but its
timestamp says not to present it until later SurfaceFlinger will wake
up every vsync until it is time to present it. Even worse, if
SurfaceFlinger has woken up but nothing has changed, it still goes
through the entire composition process.
This change (mostly) fixes that inefficiency. SurfaceFlinger will
still wake up every refresh period while there is a new frame
pending, but if there is no work to do, it will almost immediately go
back to sleep.
Bug:
18111837
Change-Id: I7825bacd37f40bf26edcc6a5e0f051dce45291fb
Dianne Hackborn [Mon, 17 Nov 2014 18:33:20 +0000 (18:33 +0000)]
Merge "Issue #
17551667: Voice interaction service should be disabled..." into lmp-mr1-dev
The Android Automerger [Mon, 17 Nov 2014 14:11:58 +0000 (06:11 -0800)]
merge in lmp-mr1-release history after reset to lmp-mr1-dev
Dianne Hackborn [Fri, 14 Nov 2014 23:45:13 +0000 (15:45 -0800)]
Issue #
17551667: Voice interaction service should be disabled...
...by default on Svelte devices
Make the voice interaction feature not available on svelte devices.
Change-Id: Iae16ff59873e6588d2aaa29624006261439262ef
Yin-Chia Yeh [Fri, 14 Nov 2014 18:56:00 +0000 (18:56 +0000)]
Merge "Add XML files for new camera2 hardware features" into lmp-mr1-dev
Narayan Kamath [Fri, 14 Nov 2014 10:23:48 +0000 (10:23 +0000)]
Fix build.
Remove reference to undefined open max index extension.
Change-Id: I984b91afad3ca4d279a31048b4112fa9afdba9e9
Lajos Molnar [Fri, 14 Nov 2014 10:02:21 +0000 (10:02 +0000)]
Merge "implement asString() for OMX enumerations used by framework" into lmp-mr1-dev
Dianne Hackborn [Fri, 14 Nov 2014 01:07:40 +0000 (17:07 -0800)]
Fix issue #
18356768: some app process may hang at Runtime#exit...
...in Parcel destructor
Don't use a Mutux object, just use simple posix mutex primitives,
to avoid static init/destroy order problems.
Change-Id: Ic012d94297564c0a55d58869f8276d7d10545fbc
Dianne Hackborn [Fri, 14 Nov 2014 01:07:40 +0000 (17:07 -0800)]
Fix issue #
18356768: some app process may hang at Runtime#exit...
...in Parcel destructor
Don't use a Mutux object, just use simple posix mutex primitives,
to avoid static init/destroy order problems.
Change-Id: Ic012d94297564c0a55d58869f8276d7d10545fbc
Yin-Chia Yeh [Thu, 13 Nov 2014 18:08:20 +0000 (10:08 -0800)]
Add XML files for new camera2 hardware features
Bug:
18276863
Change-Id: I65fa70e5ee2e9b90f819ca39f933279905b37f38
Lajos Molnar [Fri, 7 Nov 2014 01:05:46 +0000 (17:05 -0800)]
implement asString() for OMX enumerations used by framework
Bug:
18285408
Change-Id: I7893cbf0b13514e0fe9001c90db3c8387c1920c0
The Android Automerger [Wed, 12 Nov 2014 14:11:22 +0000 (06:11 -0800)]
merge in lmp-mr1-release history after reset to lmp-mr1-dev
Dianne Hackborn [Wed, 12 Nov 2014 00:24:28 +0000 (00:24 +0000)]
Merge "Add tracking of parcel memory allocations." into lmp-mr1-dev
Dianne Hackborn [Tue, 11 Nov 2014 20:22:53 +0000 (12:22 -0800)]
Add tracking of parcel memory allocations.
Change-Id: I76ffed0e69ccfe70e87d98646f11d4de7c3fd980
Craig Mautner [Wed, 12 Nov 2014 00:16:07 +0000 (00:16 +0000)]
Merge "Stop consuming input on error dialogs." into lmp-mr1-dev
Craig Mautner [Tue, 11 Nov 2014 21:28:43 +0000 (13:28 -0800)]
Stop consuming input on error dialogs.
This code is no longer necessary and was preventing input from
reaching their desired windows. See bug
17648830.
Change-Id: Ib1c026ece70e6fa98343340b89af4199d6d0ffca
Narayan Kamath [Tue, 11 Nov 2014 16:12:58 +0000 (16:12 +0000)]
Merge "Add an installd command to mark the end of boot." into lmp-mr1-dev
Narayan Kamath [Mon, 10 Nov 2014 15:03:46 +0000 (15:03 +0000)]
Add an installd command to mark the end of boot.
bug:
18280671
Change-Id: I6b3aeaf143ab3b78881f163ec5c17b9bf20172ed
The Android Automerger [Mon, 10 Nov 2014 14:10:56 +0000 (06:10 -0800)]
merge in lmp-mr1-release history after reset to lmp-mr1-dev
The Android Automerger [Sun, 9 Nov 2014 16:05:02 +0000 (08:05 -0800)]
merge in lmp-mr1-release history after reset to lmp-mr1-dev
Andreas Gampe [Sat, 8 Nov 2014 00:49:48 +0000 (16:49 -0800)]
Frameworks/native: Fix unused parameter warning
Pulled in in hardware/, where -Werror is used.
Change-Id: I13fc31d31fe2f623d39c84862b0c95a28813723d
(cherry picked from commit
a32900deec6284973100a29f7b399d061f82b3a8)
The Android Automerger [Sat, 8 Nov 2014 14:12:55 +0000 (06:12 -0800)]
merge in lmp-mr1-release history after reset to
a26143546e4665cc3b07d6527b63a2e4bb04fb9f
Aravind Akella [Fri, 7 Nov 2014 21:47:48 +0000 (21:47 +0000)]
Merge "Add a timeout for releasing SensorService wake_lock." into lmp-mr1-dev
Dan Stoza [Fri, 7 Nov 2014 19:44:30 +0000 (19:44 +0000)]
Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev
Dan Stoza [Tue, 4 Nov 2014 19:37:46 +0000 (11:37 -0800)]
Add a BufferItem parameter to onFrameAvailable
Passes the BufferItem for the queued buffer to the onFrameAvailable
callback so the consumer can track the BufferQueue's contents. Also
adds an onFrameReplaced callback, which is necessary if the consumer
wants to do anything more than simple queue length tracking.
Bug:
18111837
Change-Id: If9d07229c9b586c668e5f99074e9b63b0468feb0
The Android Automerger [Thu, 6 Nov 2014 14:13:44 +0000 (06:13 -0800)]
merge in lmp-mr1-release history after reset to
106e582053121f1934c33a6c98d35377e8ae384a
Igor Murashkin [Thu, 6 Nov 2014 02:43:56 +0000 (02:43 +0000)]
Merge "installd: Set priority to background for dexopting" into lmp-mr1-dev
Jeff Tinker [Thu, 6 Nov 2014 02:33:31 +0000 (02:33 +0000)]
Merge "Add missing secure stop methods" into lmp-mr1-dev
Igor Murashkin [Wed, 5 Nov 2014 23:21:12 +0000 (15:21 -0800)]
installd: Set priority to background for dexopting
This fixes jank caused by dex2oat while installing an application in the
background.
Bug:
17497551
Change-Id: I5a69b00c0fd76ae22a0d1adb242bef6c18a75743
Michael Lentine [Wed, 5 Nov 2014 18:58:22 +0000 (18:58 +0000)]
Merge "Fix for corruption when numFds or numInts is too large." into lmp-mr1-dev
The Android Automerger [Wed, 5 Nov 2014 14:13:00 +0000 (06:13 -0800)]
merge in lmp-mr1-release history after reset to
9cea6ccbd8789f9583c78ce2b36ac5dd75717b6c
Mark Salyzyn [Tue, 4 Nov 2014 17:38:19 +0000 (09:38 -0800)]
dumpstate: report device uptime mmc performance
Bug:
18085992
Change-Id: Ibc0a37d3d2649d1e6708d9357f37ed75f2cea121
Jesse Hall [Tue, 4 Nov 2014 16:36:31 +0000 (08:36 -0800)]
Revert "Add more logging for dup(fd) failure"
Underlying bug has been fixed, extra debug code no longer needed
This reverts commit
36273c991b189c5516819f4d5e3f83061c320593.
Change-Id: Ia47f1ae9ee7338329bfb8d710aff57e15e944f20
Jesse Hall [Tue, 4 Nov 2014 16:35:12 +0000 (08:35 -0800)]
Revert "Parcel: extra validation/debug code for writeDupFileDescriptor"
Underlying bug has been fixed, extra debug code no longer needed.
This reverts commit
ccf851f108c008d086b7f3c3923d60d385985e71.
Change-Id: I19ad9239efdf1d8f70cd74af9b7c2ae97713208f
Jesse Hall [Tue, 4 Nov 2014 16:30:48 +0000 (08:30 -0800)]
Revert "bufferqueue: workaround: allow NULL fence with queueBuffer"
Underlying bug has been fixed, workaround no longer needed
This reverts commit
5b0cbcf9464dbcda9d19ae978911222806ec8bdc.
Change-Id: Ic9532b407d1291a7780a12a75aaa117ae4aa9fcb
The Android Automerger [Tue, 4 Nov 2014 14:12:31 +0000 (06:12 -0800)]
merge in lmp-mr1-release history after reset to
7aa0c47e4205c6fca136c38f272d911c25c8a8fa
Michael Lentine [Fri, 31 Oct 2014 22:25:03 +0000 (15:25 -0700)]
Fix for corruption when numFds or numInts is too large.
Bug:
18076253
Change-Id: I4c5935440013fc755e1d123049290383f4659fb6
Naseer Ahmed [Mon, 3 Nov 2014 19:49:23 +0000 (14:49 -0500)]
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
Acked-by: Tatenda Chipeperekwa <tatendac@codeaurora.org>
The Android Automerger [Mon, 3 Nov 2014 14:11:11 +0000 (06:11 -0800)]
merge in lmp-mr1-release history after reset to
793fc0e13d25bdecda1219999f8be2cb3c121d20
The Android Automerger [Sun, 2 Nov 2014 14:10:50 +0000 (06:10 -0800)]
merge in lmp-mr1-release history after reset to
793fc0e13d25bdecda1219999f8be2cb3c121d20
Aravind Akella [Thu, 30 Oct 2014 00:55:20 +0000 (17:55 -0700)]
Add a timeout for releasing SensorService wake_lock.
If SensorService is holding a wake_lock and there are no acknowledgements
from ANY app within 5 seconds, release the wake_lock and reset the wake_lock
refcounts for all connections.
Bug:
16874240
Change-Id: I5e950dd393c20173c439cbd5a4ba614ee09d61f4
The Android Automerger [Sat, 1 Nov 2014 13:11:11 +0000 (06:11 -0700)]
merge in lmp-mr1-release history after reset to
793fc0e13d25bdecda1219999f8be2cb3c121d20
Michael Lentine [Fri, 31 Oct 2014 23:37:47 +0000 (23:37 +0000)]
Merge "Fix crash when user provides large values in the Parcel." into lmp-mr1-dev
Michael Lentine [Fri, 31 Oct 2014 18:10:13 +0000 (11:10 -0700)]
Fix crash when user provides large values in the Parcel.
Bug:
18102648
Change-Id: Ie6a24718e586a34424238363de80f9545951514f
Michael Lentine [Fri, 31 Oct 2014 18:39:22 +0000 (18:39 +0000)]
Merge "Fix output of pointers for 64bit devices." into lmp-mr1-dev
Michael Lentine [Fri, 31 Oct 2014 18:08:19 +0000 (11:08 -0700)]
Fix output of pointers for 64bit devices.
Change-Id: I279c1cf8d4c126b98f4a92ca807ade3749d01ff0
Jesse Hall [Fri, 31 Oct 2014 16:59:45 +0000 (16:59 +0000)]
Merge "surfaceflinger: fix -Wunused-parameter warning" into lmp-mr1-dev
Jesse Hall [Fri, 31 Oct 2014 16:59:26 +0000 (16:59 +0000)]
Merge "surfaceflinger: fix -Wsign-compare warnings" into lmp-mr1-dev
Jesse Hall [Fri, 31 Oct 2014 16:59:11 +0000 (16:59 +0000)]
Merge "surfaceflinger: fix -Woverloaded-virtual warning" into lmp-mr1-dev
Jesse Hall [Fri, 31 Oct 2014 16:58:44 +0000 (16:58 +0000)]
Merge "surfaceflinger: fix -Wmismatched-tags warnings" into lmp-mr1-dev
Jesse Hall [Fri, 8 Aug 2014 05:48:06 +0000 (22:48 -0700)]
surfaceflinger: fix -Wunused-parameter warning
warning: unused parameter 'mustRecompose' [-Wunused-parameter]
Change-Id: I6b8c671189639d851bfa5548742de988d6fa2687
(cherry picked from
d2e514f71709e6af3dbc754e59686129737f2300)
Jesse Hall [Fri, 8 Aug 2014 05:43:06 +0000 (22:43 -0700)]
surfaceflinger: fix -Wsign-compare warnings
warning: comparison of integers of different signs: 'int' and 'size_t'
(aka 'unsigned int') [-Wsign-compare]
arning: comparison of integers of different signs: 'int32_t' (aka
'int') and 'const uint32_t' (aka 'const unsigned int')
[-Wsign-compare]
Change-Id: I823257aa7218c5fd492a3277853210db539bb2e2
(cherry picked from
f9bfdc6c9449143eed674c03e15dd8278296d32b)
Jesse Hall [Fri, 8 Aug 2014 05:33:14 +0000 (22:33 -0700)]
surfaceflinger: fix -Woverloaded-virtual warning
warning: 'android::LayerDim::isOpaque' hides overloaded virtual function
[-Woverloaded-virtual]
Change-Id: Ie27a6c943f485bc89ce11e424a4e7d99805d4dd0
(cherry picked from commit
382574d116759ccc19463c03db841e3d6e2d4424)
Jesse Hall [Fri, 8 Aug 2014 05:19:07 +0000 (22:19 -0700)]
surfaceflinger: fix -Wmismatched-tags warnings
warning: struct 'HWComposer' was previously declared as a class
[-Wmismatched-tags]
warning: class 'DisplayInfo' was previously declared as a struct
[-Wmismatched-tags]
Change-Id: I13db9f8aab3a957ce8ff8d64598dae1807d6fe7e
(cherry picked from commit
646f54105018e99ef4a30ee41f01f7d1ab66c38e)
Jeff Tinker [Fri, 31 Oct 2014 07:42:33 +0000 (00:42 -0700)]
Add missing secure stop methods
b/
18053197
b/
18076411
Change-Id: I42b97f7e39d6e9e58990b41a4c4b5a7c9b8a49cf
The Android Automerger [Thu, 30 Oct 2014 13:11:21 +0000 (06:11 -0700)]
merge in lmp-mr1-release history after reset to
7b97351b68e96ea67380140266abb897fe1be57d
Dan Stoza [Wed, 29 Oct 2014 18:32:49 +0000 (18:32 +0000)]
Merge "Initialize ARect fields in default ctor" into lmp-mr1-dev
Jesse Hall [Wed, 6 Aug 2014 19:15:15 +0000 (12:15 -0700)]
GLConsumer: correct EGL_NO_DISPLAY to EGL_NO_CONTEXT
Change-Id: I4dcb57a0db9ee3c5222cd453c9213859384212b0
(cherry picked from commit
46a1f6b40e1f7677cd41cd30f729ff66c7c21517)
The Android Automerger [Wed, 29 Oct 2014 13:10:44 +0000 (06:10 -0700)]
merge in lmp-mr1-release history after reset to
70ec2941530766bdca09ef2983a3ff794c028ee6
Dmitriy Ivanov [Tue, 28 Oct 2014 23:41:10 +0000 (16:41 -0700)]
Initialize ARect fields in default ctor
So that we can use Rect() for update and such.
Bug:
18095940
Change-Id: I03ed87121d2d279f22013b75e95dd7254551ca1f
Dan Stoza [Wed, 15 Oct 2014 23:34:55 +0000 (16:34 -0700)]
Don't run large virtual displays through HWC
This change watches for a MAX_VIRTUAL_DISPLAY_DIMENSION value, which
will be set (if necessary) in BoardConfig.mk. If the value is set,
any virtual displays that have a width or a height greater than that
dimension will bypass the hardware composer HAL and be handled only
by SurfaceFlinger.
Bug:
17701816
Change-Id: Ia6ca44dfd6a7a9bc0f054493d3f13006bc32fa14
The Android Automerger [Tue, 28 Oct 2014 13:13:58 +0000 (06:13 -0700)]
merge in lmp-mr1-release history after reset to
70ec2941530766bdca09ef2983a3ff794c028ee6
Patrick Auchter [Tue, 30 Sep 2014 20:38:30 +0000 (15:38 -0500)]
atrace: fix Sync Manager tracing preventing enabling of kernel sync tracing
Both Sync Manager tracing and kernel sync tracing were using "sync" to
enable tracing and since Sync Manager was found first, this prevented
enabling kernel sync tracing.
To fix this, use "syncman" to enable Sync Manager tracing.
Change-Id: Id3b799e01e5041c582cd752c8c40d3e36954f821
Signed-off-by: Iliyan Malchev <malchev@google.com>
The Android Automerger [Mon, 27 Oct 2014 13:10:26 +0000 (06:10 -0700)]
merge in lmp-mr1-release history after reset to
131866e1a4cb3c592f923e95a8c1a66291e2057a
The Android Automerger [Sun, 26 Oct 2014 13:10:18 +0000 (06:10 -0700)]
merge in lmp-mr1-release history after reset to
131866e1a4cb3c592f923e95a8c1a66291e2057a
The Android Automerger [Sat, 25 Oct 2014 13:11:05 +0000 (06:11 -0700)]
merge in lmp-mr1-release history after reset to
131866e1a4cb3c592f923e95a8c1a66291e2057a
Riley Andrews [Fri, 24 Oct 2014 18:30:07 +0000 (18:30 +0000)]
Merge "Add glFlush in surfaceflinger screenshot code." into lmp-mr1-dev
Riley Andrews [Thu, 23 Oct 2014 23:17:04 +0000 (16:17 -0700)]
Add glFlush in surfaceflinger screenshot code.
After creating a syncKHR object with type EGL_SYNC_NATIVE_FENCE_ANDROID,
glFlush must be called before the EGL_SYNC_NATIVE_FENCE_FD_ANDROID attribute
is populated with a sync fd. We currently call eglDupNativeFenceFDANDROID
before issuing the flush.
Bug
18052459
Taken verbatim from matthew.k.gumbel@intel.com.
Change-Id: I3781d14f92862076e2bca7d27341a6dc6e7e3775
The Android Automerger [Thu, 23 Oct 2014 13:12:15 +0000 (06:12 -0700)]
merge in lmp-mr1-release history after reset to
8ad8c0a775a1d4592479731973238b82480f76b2
Jesse Hall [Wed, 22 Oct 2014 20:45:35 +0000 (20:45 +0000)]
am
afe2b1fa: surfaceflinger: don\'t close fence fds after passing to queueBuffer
* commit '
afe2b1fadd29149ceed639357e44e06e97c3a5ca':
surfaceflinger: don't close fence fds after passing to queueBuffer
The Android Automerger [Wed, 22 Oct 2014 13:10:41 +0000 (06:10 -0700)]
merge in lmp-mr1-release history after reset to
dcc959beb77099d319a94e3985da2f4ea4064e7b
Michael Lentine [Tue, 21 Oct 2014 18:20:44 +0000 (18:20 +0000)]
Merge "Adding eglInitialize and eglTerminate image creation and deletion." into lmp-mr1-dev
Jesse Hall [Tue, 21 Oct 2014 18:09:17 +0000 (11:09 -0700)]
surfaceflinger: don't close fence fds after passing to queueBuffer
ANativeWindow::queueBuffer takes ownership of the fence fd passed to
it, and will close it before returning. SurfaceFlinger's screenshot
code was also closing the syncFd it passed to queueBuffer. Most of the
time this meant the second close() silently failed, but in a rare race
condition the file descriptor could be reused between the two
close()s.
Bug:
17946343
Change-Id: Ib74fcb1dce52cc21328059c99b7c4c76f41aa3a5
The Android Automerger [Tue, 21 Oct 2014 13:12:38 +0000 (06:12 -0700)]
merge in lmp-mr1-release history after reset to
bf46706f366f0446e60971e32acfcd221b7f19cf
Arve Hjønnevåg [Mon, 20 Oct 2014 21:58:26 +0000 (21:58 +0000)]
Merge "dumpstate: Add trusty version if driver is found" into lmp-mr1-dev
Dmitriy Ivanov [Mon, 20 Oct 2014 17:14:42 +0000 (17:14 +0000)]
Merge "Link sigchain to surfaceflinger main executable" into lmp-mr1-dev
Jesse Hall [Mon, 20 Oct 2014 14:17:18 +0000 (14:17 +0000)]
am
649bafb7: Merge "bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MERGE)" into lmp-dev
* commit '
649bafb7ba2c3204295bc3451ff7af7e28e714ed':
bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MERGE)
Jesse Hall [Mon, 20 Oct 2014 13:59:24 +0000 (13:59 +0000)]
Merge "bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MERGE)" into lmp-dev
The Android Automerger [Mon, 20 Oct 2014 13:10:37 +0000 (06:10 -0700)]
merge in lmp-mr1-release history after reset to
899891ec95c0581d35f47db7bdea75bd49fdca1b
Aravind Akella [Sun, 19 Oct 2014 21:14:54 +0000 (21:14 +0000)]
am
0b6acb22: Add version number to SensorService dump output.
* commit '
0b6acb2231baed861488f2d181621272d0658d25':
Add version number to SensorService dump output.
Aravind Akella [Sat, 18 Oct 2014 23:37:13 +0000 (16:37 -0700)]
Add version number to SensorService dump output.
Change-Id: I64f9482ade523ec3fafe14bff14db7196e32413f
The Android Automerger [Sun, 19 Oct 2014 13:09:58 +0000 (06:09 -0700)]
merge in lmp-mr1-release history after reset to
91c395f6c344682f1ae5926766d4d7247dee6df4
Jesse Hall [Sun, 19 Oct 2014 04:47:04 +0000 (21:47 -0700)]
bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MERGE)
On one device there is a bug, not yet root-caused, that causes fence
fds to not make it across binder from producer to consumer in the
IGraphicBufferProducer::queueBuffer call. Rather than returning an
error, which the producer typically treats as a fatal error, this
change allows the buffer to be queued with no fence. This avoids an
application crash at the risk of (likely single-frame) visible
corruption.
Bug:
17946343
Change-Id: I9ca89f94098c455e1e90f5f58d5336c936b04a9c
The Android Automerger [Sat, 18 Oct 2014 13:11:01 +0000 (06:11 -0700)]
merge in lmp-mr1-release history after reset to
91c395f6c344682f1ae5926766d4d7247dee6df4
Arve Hjønnevåg [Thu, 16 Oct 2014 01:08:37 +0000 (18:08 -0700)]
dumpstate: Add trusty version if driver is found
Change-Id: I7780ea8e1d777c222a73408f70d8a6d49dee1d92
Dmitriy Ivanov [Tue, 7 Oct 2014 20:40:41 +0000 (13:40 -0700)]
Link sigchain to surfaceflinger main executable
And export necessary symbols to preempt calls from libart.so
Bug:
15345057
Bug:
15426766
(cherry picked from commit
f3da24d8cf02d7c74ff7c24eae0154a21a192fda)
Change-Id: I03b632e0bf2cbaf4a0e68cd0af4e991f7f6b08e4
The Android Automerger [Thu, 16 Oct 2014 13:12:17 +0000 (06:12 -0700)]
merge in lmp-mr1-release history after reset to
91c395f6c344682f1ae5926766d4d7247dee6df4
Robin Lee [Wed, 15 Oct 2014 23:25:00 +0000 (23:25 +0000)]
am
60fd3fee: Migrate CA certificates to all users
* commit '
60fd3feecab4336d964ca8e31c7c3220e1afb558':
Migrate CA certificates to all users