OSDN Git Service
Jesse Hall [Tue, 4 Nov 2014 17:35:23 +0000 (17:35 +0000)]
am
fee99040: Revert "Add more logging for dup(fd) failure"
* commit '
fee99040de000a64f6036a7db172fb7c68d9764a':
Revert "Add more logging for dup(fd) failure"
Jesse Hall [Tue, 4 Nov 2014 17:35:23 +0000 (17:35 +0000)]
am
8e5cf83a: Revert "Parcel: extra validation/debug code for writeDupFileDescriptor"
* commit '
8e5cf83afbe2b671f96d04786cf0d0f967e342f9':
Revert "Parcel: extra validation/debug code for writeDupFileDescriptor"
Jesse Hall [Tue, 4 Nov 2014 17:35:22 +0000 (17:35 +0000)]
am
de288fe2: Revert "bufferqueue: workaround: allow NULL fence with queueBuffer"
* commit '
de288fe2d43adfa1b2243ae534faaf832bf50491':
Revert "bufferqueue: workaround: allow NULL fence with queueBuffer"
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
Chih-Hung Hsieh [Tue, 4 Nov 2014 01:58:17 +0000 (01:58 +0000)]
am
ac5cd96f: am
dbab409c: Merge "Avoid two warnings from clang."
* commit '
ac5cd96fe24690d9e0ae823c77334b8579139aa2':
Avoid two warnings from clang.
Chih-Hung Hsieh [Tue, 4 Nov 2014 01:24:07 +0000 (01:24 +0000)]
am
dbab409c: Merge "Avoid two warnings from clang."
* commit '
dbab409c49ca5dd6686912d0b3eeb19ef1c37a3e':
Avoid two warnings from clang.
Chih-Hung Hsieh [Tue, 4 Nov 2014 01:14:16 +0000 (01:14 +0000)]
Merge "Avoid two warnings from clang."
Naseer Ahmed [Mon, 3 Nov 2014 22:31:50 +0000 (22:31 +0000)]
am
7aa0c47e: sf: Add a NULL check in getDisplayConfigs
* commit '
7aa0c47e4205c6fca136c38f272d911c25c8a8fa':
sf: Add a NULL check in getDisplayConfigs
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>
Michael Lentine [Sat, 1 Nov 2014 00:33:29 +0000 (00:33 +0000)]
am
793fc0e1: Merge "Fix crash when user provides large values in the Parcel." into lmp-mr1-dev
* commit '
793fc0e13d25bdecda1219999f8be2cb3c121d20':
Fix crash when user provides large values in the Parcel.
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 22:58:19 +0000 (22:58 +0000)]
am
98536859: Merge "Fix output of pointers for 64bit devices." into lmp-mr1-dev
* commit '
9853685931298ba02066ebb50a8377ad4aa80f00':
Fix output of pointers for 64bit devices.
Jesse Hall [Fri, 31 Oct 2014 22:57:44 +0000 (22:57 +0000)]
am
affc4d80: Merge "surfaceflinger: fix -Wunused-parameter warning" into lmp-mr1-dev
* commit '
affc4d809edbcb3b0e49e5ccc9821b9695a57d44':
surfaceflinger: fix -Wunused-parameter warning
Jesse Hall [Fri, 31 Oct 2014 22:57:43 +0000 (22:57 +0000)]
am
c7636f60: Merge "surfaceflinger: fix -Wsign-compare warnings" into lmp-mr1-dev
* commit '
c7636f606270a4b79d745ec1acf049daedfa0e2f':
surfaceflinger: fix -Wsign-compare warnings
Jesse Hall [Fri, 31 Oct 2014 22:57:42 +0000 (22:57 +0000)]
am
6e74e3cc: Merge "surfaceflinger: fix -Woverloaded-virtual warning" into lmp-mr1-dev
* commit '
6e74e3ccd972fe90d9998f6b683e25dca38f470d':
surfaceflinger: fix -Woverloaded-virtual warning
Jesse Hall [Fri, 31 Oct 2014 22:41:03 +0000 (15:41 -0700)]
resolved conflicts for merge of
04c9683a to lmp-mr1-dev-plus-aosp
Change-Id: I83fdaf504ca37536c277a146c1d624e44cfe11b0
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
Chih-Hung Hsieh [Fri, 24 Oct 2014 21:10:09 +0000 (14:10 -0700)]
Avoid two warnings from clang.
Clang compiler warns about undefined static functions like getReturnString
before all references are removed inside IF_LOG_COMMANDS.
To remove such warnings, we can leave those static functions defined
and the compiler will remove them at the end when they are not used.
Add a cast to long before converting from int to void*,
to avoid type cast warnings on 64 bit targets.
BUG:
17043248
Change-Id: Ica31101522279d2c8eacc90e2939767002fb827b
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)
Dan Stoza [Thu, 30 Oct 2014 20:58:44 +0000 (20:58 +0000)]
am
7b97351b: Merge "Initialize ARect fields in default ctor" into lmp-mr1-dev
* commit '
7b97351b68e96ea67380140266abb897fe1be57d':
Initialize ARect fields in default ctor
Jesse Hall [Thu, 30 Oct 2014 20:58:43 +0000 (20:58 +0000)]
am
1834f8ea: GLConsumer: correct EGL_NO_DISPLAY to EGL_NO_CONTEXT
* commit '
1834f8ea975e9a882b44dc479320fe02e306e630':
GLConsumer: correct EGL_NO_DISPLAY to EGL_NO_CONTEXT
Dan Stoza [Thu, 30 Oct 2014 20:58:42 +0000 (20:58 +0000)]
am
1f3efb11: Don\'t run large virtual displays through HWC
* commit '
1f3efb11ff8c884a254f4272f0d1ee0b77ceff2f':
Don't run large virtual displays through HWC
Dan Stoza [Wed, 29 Oct 2014 23:08:21 +0000 (23:08 +0000)]
am
f3929d66: am
e42cba8f: Merge "Initialize ARect fields in default ctor"
* commit '
f3929d6611bb8278e561fdd4b05a21915ac9de76':
Initialize ARect fields in default ctor
Dan Stoza [Wed, 29 Oct 2014 23:04:05 +0000 (23:04 +0000)]
am
e42cba8f: Merge "Initialize ARect fields in default ctor"
* commit '
e42cba8feb2bbfe385f162a06e41e2c2c0f40c99':
Initialize ARect fields in default ctor
Dan Stoza [Wed, 29 Oct 2014 22:58:47 +0000 (22:58 +0000)]
Merge "Initialize ARect fields in default ctor"
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, 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)
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
Patrick Auchter [Tue, 28 Oct 2014 07:21:22 +0000 (07:21 +0000)]
am
70ec2941: atrace: fix Sync Manager tracing preventing enabling of kernel sync tracing
* commit '
70ec2941530766bdca09ef2983a3ff794c028ee6':
atrace: fix Sync Manager tracing preventing enabling of kernel sync tracing
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>
Dmitriy Ivanov [Mon, 27 Oct 2014 04:18:33 +0000 (04:18 +0000)]
Jesse Hall [Mon, 27 Oct 2014 04:18:33 +0000 (04:18 +0000)]
am
f35a5ba6: (-s ours) am
649bafb7: Merge "bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MERGE)" into lmp-dev
* commit '
f35a5ba664f53813c2fb7c903e5f4809ad029569':
Aravind Akella [Mon, 27 Oct 2014 04:18:32 +0000 (04:18 +0000)]
am
433fe2af: am
0b6acb22: Add version number to SensorService dump output.
* commit '
433fe2af0dd9a895cbe65ac5d5b9cb68c5924d8a':
Dan Albert [Mon, 27 Oct 2014 04:18:32 +0000 (04:18 +0000)]
Narayan Kamath [Mon, 27 Oct 2014 04:18:31 +0000 (04:18 +0000)]
am
97a3367a: Clean up unused parameter warnings.
* commit '
97a3367a1b49b1761e3485765b2bd3f2293f9638':
Clean up unused parameter warnings.
Chih-hung Hsieh [Mon, 27 Oct 2014 04:18:31 +0000 (04:18 +0000)]
am
82ba423f: am
e9034b45: Merge "Use LOCAL_CLANG := false for GLES wrappers for now"
* commit '
82ba423f1ca6b05956cc82ecb12da8e5048fa645':
Dan Albert [Mon, 27 Oct 2014 04:18:30 +0000 (04:18 +0000)]
am
759115cd: am
9cc84950: Merge "Don\'t check if this == NULL."
* commit '
759115cd6d6e4f7909342e25f1002a9d74ceee5e':
Robin Lee [Mon, 27 Oct 2014 04:18:29 +0000 (04:18 +0000)]
am
0adea3b7: am
60fd3fee: Migrate CA certificates to all users
* commit '
0adea3b792ecddab7dbb450135e04d6736e872c6':
Dmitriy Ivanov [Mon, 27 Oct 2014 04:18:29 +0000 (04:18 +0000)]
am
9b9d1a4e: am
26a28149: Merge "Link sigchain to surfaceflinger main executable"
* commit '
9b9d1a4ee54817028549e3b3c49f5c9898b11406':
Lajos Molnar [Mon, 27 Oct 2014 04:18:28 +0000 (04:18 +0000)]
am
e7e61bef: am
3454f123: media: add kMetadataBufferTypeGraphicBuffer
* commit '
e7e61beffc8be64f604781d7b7ea96828bbb554d':
Jeff Brown [Mon, 27 Oct 2014 04:18:28 +0000 (04:18 +0000)]
Narayan Kamath [Mon, 27 Oct 2014 04:18:27 +0000 (04:18 +0000)]
am
4335d35c: am
9ea09757: Fix broken error check in Parcel::readBlob
* commit '
4335d35c71e777d42fbe8d53fa6b8fbc95d4c2b7':
Aravind Akella [Mon, 27 Oct 2014 04:18:26 +0000 (04:18 +0000)]
am
a046f506: am
7830ef3d: Change ordering of memory allocation and calling Thread::run().
* commit '
a046f506a52aa8fd0fe193b18fe283da83107f09':
Jesse Hall [Mon, 27 Oct 2014 04:18:26 +0000 (04:18 +0000)]
am
5cc3b8b4: am
78639c22: Merge "Parcel: extra validation/debug code for writeDupFileDescriptor" into lmp-dev
* commit '
5cc3b8b4c81c6e157f540a27e70559ee034e313d':
Aravind Akella [Mon, 27 Oct 2014 04:18:25 +0000 (04:18 +0000)]
am
021543fc: am
a7eb4b74: Merge "Fix sockfd leakage in SensorService." into lmp-dev
* commit '
021543fc657a7f21d1b143c68258282b35262906':
Riley Andrews [Mon, 27 Oct 2014 04:18:24 +0000 (04:18 +0000)]
am
8dcdf796: am
6747be9f: Generate the SurfaceFlinger shader cache on initialization
* commit '
8dcdf7961b22ad36cb43d0f5353a1b5663448fd4':
Jesse Hall [Mon, 27 Oct 2014 04:18:24 +0000 (04:18 +0000)]
am
0c2da971: am
f05ef4e5: Merge "Surface: cancel the dequeued buffer when requestBuffer fails" into lmp-dev
* commit '
0c2da9719bde37305c5724e54f97a8f61c7e8d0b':
Lajos Molnar [Mon, 27 Oct 2014 04:18:23 +0000 (04:18 +0000)]
am
be89b6f0: am
0ba908e7: Merge "add OMX_VIDEO_AVCLevel52 constant" into lmp-dev
* commit '
be89b6f0846d0ede5e6a4fed6115298285cdab60':
Michael Lentine [Mon, 27 Oct 2014 04:18:22 +0000 (04:18 +0000)]
am
df035b91: am
36462d9d: Merge "Add more logging for dup(fd) failure" into lmp-dev
* commit '
df035b91df50cf8a308121c43a2660f403b257ee':
Christopher Ferris [Mon, 27 Oct 2014 04:18:22 +0000 (04:18 +0000)]
am
f625a249: am
a91968fd: Merge "Accept socket connection before tracing." into lmp-dev
* commit '
f625a249b9a0de54eedf3fa0aaa549c1fb568298':
Michael Lentine [Mon, 27 Oct 2014 04:18:21 +0000 (04:18 +0000)]
am
20daf003: am
db57cfbd: Merge "When eglMakeCurrent fails we need to fix the egl state." into lmp-dev
* commit '
20daf003aaf1f01d5ef3cd60306db3cff89512c8':
Chong Zhang [Mon, 27 Oct 2014 04:18:20 +0000 (04:18 +0000)]
am
30e4b31a: am
dd230cb8: Merge "add a parameter for PCM limiter enable" into lmp-dev
* commit '
30e4b31a8e3d189934842487f81cbbca8f74cbae':
Jesse Hall [Mon, 27 Oct 2014 04:18:20 +0000 (04:18 +0000)]
am
e245cdcc: am
5bf786d8: surfaceflinger: recompute visibility after sideband stream change
* commit '
e245cdcc004ee13920aa0b74790a2b5c758662a2':
Narayan Kamath [Mon, 27 Oct 2014 04:18:19 +0000 (04:18 +0000)]
am
28da3288: am
cde4b13a: Merge "Allow more than one dex2oat extra option"
* commit '
28da32889bad10835eedd2a6c8ee50591b17e4e2':
Dianne Hackborn [Mon, 27 Oct 2014 04:18:17 +0000 (04:18 +0000)]
am
e4499526: am
5ee2c9d2: Work on issue #
17656716: Unhandled exception in Window Manager
* commit '
e4499526eee52a6584aba9382783e9fba327a9bc':
Aravind Akella [Mon, 27 Oct 2014 04:18:17 +0000 (04:18 +0000)]
am
112a7457: am
deb71b28: Merge "Fix a possible SensorService deadlock." into lmp-dev
* commit '
112a7457aedc694de9ba06359e738893e28c640a':
Jesse Hall [Mon, 27 Oct 2014 04:18:16 +0000 (04:18 +0000)]
am
2a8ae4ef: am
bacc28ef: surfaceflinger: Use landscape resolution for default dpi
* commit '
2a8ae4ef70f2a3e0239a4df9bf33b4ff141594fe':
Aravind Akella [Mon, 27 Oct 2014 04:18:15 +0000 (04:18 +0000)]
am
bea1db57: am
71e351d9: Merge "Revert "Fix sockfd leakage in SensorService. Remove sockfd from Looper when the connection is removed from mActiveConnections."" into lmp-dev
* commit '
bea1db57deb3488fe3eb8c3f74ed05c64a5710bf':
Michael Wright [Mon, 27 Oct 2014 04:18:15 +0000 (04:18 +0000)]
am
cfbc3654: am
4b20d402: Merge "Only mark repeated keys as PASS_TO_USER if the original key was." into lmp-dev
* commit '
cfbc36544e8856d49d86f61de1a0815ceef4d395':
Jesse Hall [Mon, 27 Oct 2014 04:18:14 +0000 (04:18 +0000)]
am
1b5c8839: am
728a8da1: Merge "surfaceflinger: Check sideband stream changed to trigger sideband Layer update." into lmp-dev
* commit '
1b5c8839f7bbdebb3b30a6584e67402e8cb4a979':
Aravind Akella [Mon, 27 Oct 2014 04:18:14 +0000 (04:18 +0000)]
am
8b4869dc: am
5105960d: Fix sockfd leakage in SensorService. Remove sockfd from Looper when the connection is removed from mActiveConnections.
* commit '
8b4869dc832b098bd8de1fb20bf36ff8ae9c4d28':
Michael Lentine [Mon, 27 Oct 2014 04:18:13 +0000 (04:18 +0000)]
am
53bffaaf: am
12c4bdad: Add rate-limited logging for unimplemented es functions.
* commit '
53bffaaf277f8b9ebd1bffafe52f9a66b38fe792':
Dan Albert [Mon, 27 Oct 2014 04:18:12 +0000 (04:18 +0000)]
Lorenzo Colitti [Mon, 27 Oct 2014 04:18:11 +0000 (04:18 +0000)]
am
7a99e281: am
d9485403: Merge "Include the VPN server IP address in the VPN state file." into lmp-dev
* commit '
7a99e281dd367ff9bc107e59944d11399ac1deee':
Sean Wan [Mon, 27 Oct 2014 04:18:10 +0000 (04:18 +0000)]
am
0c6e249c: am
b1982b75: am
60d31a0f: am
3c648e37: Update comment to use correct GPS file for wearable.
* commit '
0c6e249cba71b1b24c6b344cdf8f17370dd871dc':
Lajos Molnar [Mon, 27 Oct 2014 04:18:09 +0000 (04:18 +0000)]
am
435d9cde: resolved conflicts for merge of
67d8bd66 to lmp-dev-plus-aosp
* commit '
435d9cde2777950c1d93b0982839d6796c5688b2':
Unsuk Jung [Mon, 27 Oct 2014 04:18:09 +0000 (04:18 +0000)]
am
556888b8: am
5bbf73ce: Merge "Fix typo for android.hardware.audio.output feature in handheld device config" into lmp-dev
* commit '
556888b8ba32d923351bfb2317232dd78fff9c26':
Aravind Akella [Mon, 27 Oct 2014 04:18:07 +0000 (04:18 +0000)]
am
c8a1b367: am
e225f6fd: Merge "SensorService fixes." into lmp-dev
* commit '
c8a1b36745e2094e5fdc7915739caca396c2d9de':
Ihab Awad [Mon, 27 Oct 2014 04:18:06 +0000 (04:18 +0000)]
am
9b1543ad: am
5430cead: Add system feature for ConnectionService API support (2/3)
* commit '
9b1543ad2f6f58aa116cf520378df12d46fbc037':
Riley Andrews [Fri, 24 Oct 2014 18:39:16 +0000 (18:39 +0000)]
am
131866e1: Merge "Add glFlush in surfaceflinger screenshot code." into lmp-mr1-dev
* commit '
131866e1a4cb3c592f923e95a8c1a66291e2057a':
Add glFlush in surfaceflinger screenshot code.
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
Jesse Hall [Wed, 22 Oct 2014 21:27:11 +0000 (21:27 +0000)]
am
8ad8c0a7: am
afe2b1fa: surfaceflinger: don\'t close fence fds after passing to queueBuffer
* commit '
8ad8c0a775a1d4592479731973238b82480f76b2':
surfaceflinger: don't close fence fds after passing to queueBuffer
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
Michael Lentine [Tue, 21 Oct 2014 18:35:24 +0000 (18:35 +0000)]
am
dcc959be: Merge "Adding eglInitialize and eglTerminate image creation and deletion." into lmp-mr1-dev
* commit '
dcc959beb77099d319a94e3985da2f4ea4064e7b':
Adding eglInitialize and eglTerminate image creation and deletion.
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
Dmitriy Ivanov [Tue, 21 Oct 2014 03:30:55 +0000 (03:30 +0000)]
am
cb8a9fcc: Merge "Switch to libsigchain.a"
* commit '
cb8a9fcc56288378d05d80c55396db7981e3828d':
Switch to libsigchain.a
Dmitriy Ivanov [Tue, 21 Oct 2014 03:30:18 +0000 (03:30 +0000)]
am
cb8a9fcc: Merge "Switch to libsigchain.a"
* commit '
cb8a9fcc56288378d05d80c55396db7981e3828d':
Switch to libsigchain.a
Dmitriy Ivanov [Tue, 21 Oct 2014 03:14:18 +0000 (03:14 +0000)]
Merge "Switch to libsigchain.a"
Arve Hjønnevåg [Mon, 20 Oct 2014 22:07:49 +0000 (22:07 +0000)]
am
bf46706f: Merge "dumpstate: Add trusty version if driver is found" into lmp-mr1-dev
* commit '
bf46706f366f0446e60971e32acfcd221b7f19cf':
dumpstate: Add trusty version if driver is found
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 21:17:26 +0000 (14:17 -0700)]
Switch to libsigchain.a
Use LOCAL_WHOLE_STATIC_LIBRARIES to instruct static linker
to export symbols from the static library.
Change-Id: I0e41cf173be96c52cdad72b1ef4a1bf819e65dd2
Dmitriy Ivanov [Mon, 20 Oct 2014 18:28:14 +0000 (18:28 +0000)]
am
042e5078: Merge "Link sigchain to surfaceflinger main executable" into lmp-mr1-dev
* commit '
042e5078f7444a68d22d706b66ba32efc220c263':
Link sigchain to surfaceflinger main executable
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:31:38 +0000 (14:31 +0000)]
am
a069e853: am
649bafb7: Merge "bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MERGE)" into lmp-dev
* commit '
a069e8532ba272ac5b935e332e426a3dacf827fc':
bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MERGE)
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)