Jesse Hall
1834f8ea97
GLConsumer: correct EGL_NO_DISPLAY to EGL_NO_CONTEXT
...
Change-Id: I4dcb57a0db9ee3c5222cd453c9213859384212b0
(cherry picked from commit 46a1f6b40e
)
2014-10-29 17:15:09 +00:00
The Android Automerger
8fd04be3f3
merge in lmp-mr1-release history after reset to 70ec294153
2014-10-29 06:10:44 -07:00
Dmitriy Ivanov
b2e19208dd
Initialize ARect fields in default ctor
...
So that we can use Rect() for update and such.
Bug: 18095940
Change-Id: I03ed87121d2d279f22013b75e95dd7254551ca1f
2014-10-28 16:41:10 -07:00
Dan Stoza
1f3efb11ff
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
2014-10-28 16:01:47 -07:00
The Android Automerger
515a28f582
merge in lmp-mr1-release history after reset to 70ec294153
2014-10-28 06:13:58 -07:00
Patrick Auchter
de0cdcd42c
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
2014-10-28 07:21:22 +00:00
Patrick Auchter
70ec294153
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>
2014-10-27 13:07:58 -07:00
The Android Automerger
815dcee07a
merge in lmp-mr1-release history after reset to 131866e1a4
2014-10-27 06:10:26 -07:00
Dmitriy Ivanov
75b2146258
am 5cf92d4a
: am cb8a9fcc
: Merge "Switch to libsigchain.a"
...
* commit '5cf92d4a85efe7bcff4d0818d8d88afa252f7cc7':
2014-10-27 04:18:33 +00:00
Jesse Hall
539be3bb55
am f35a5ba6
: (-s ours) am 649bafb7
: Merge "bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MERGE)" into lmp-dev
...
* commit 'f35a5ba664f53813c2fb7c903e5f4809ad029569':
2014-10-27 04:18:33 +00:00
Aravind Akella
f294e1402e
am 433fe2af
: am 0b6acb22
: Add version number to SensorService dump output.
...
* commit '433fe2af0dd9a895cbe65ac5d5b9cb68c5924d8a':
2014-10-27 04:18:32 +00:00
Dan Albert
b225fa3b59
am 55833709
: am c52e54c4
: Merge "Some more test cleanup."
...
* commit '55833709ab4b8e6f85d19be0a5b1a096277a2dc2':
2014-10-27 04:18:32 +00:00
Narayan Kamath
d13c57a485
am 97a3367a
: Clean up unused parameter warnings.
...
* commit '97a3367a1b49b1761e3485765b2bd3f2293f9638':
Clean up unused parameter warnings.
2014-10-27 04:18:31 +00:00
Chih-hung Hsieh
3c746b7b7c
am 82ba423f
: am e9034b45
: Merge "Use LOCAL_CLANG := false for GLES wrappers for now"
...
* commit '82ba423f1ca6b05956cc82ecb12da8e5048fa645':
2014-10-27 04:18:31 +00:00
Dan Albert
093457a4fe
am 759115cd
: am 9cc84950
: Merge "Don\'t check if this == NULL."
...
* commit '759115cd6d6e4f7909342e25f1002a9d74ceee5e':
2014-10-27 04:18:30 +00:00
Robin Lee
ca50b6c516
am 0adea3b7
: am 60fd3fee
: Migrate CA certificates to all users
...
* commit '0adea3b792ecddab7dbb450135e04d6736e872c6':
2014-10-27 04:18:29 +00:00
Dmitriy Ivanov
5b829eb662
am 9b9d1a4e
: am 26a28149
: Merge "Link sigchain to surfaceflinger main executable"
...
* commit '9b9d1a4ee54817028549e3b3c49f5c9898b11406':
2014-10-27 04:18:29 +00:00
Lajos Molnar
09a4bbdaf7
am e7e61bef
: am 3454f123
: media: add kMetadataBufferTypeGraphicBuffer
...
* commit 'e7e61beffc8be64f604781d7b7ea96828bbb554d':
2014-10-27 04:18:28 +00:00
Jeff Brown
c5c79f50d0
am 1222c894
: am ffb49774
: Improve ANR diagnostics.
...
* commit '1222c8944aaa729a54b61496ac125747a31cf5f5':
2014-10-27 04:18:28 +00:00
Narayan Kamath
7e5ecdc601
am 4335d35c
: am 9ea09757
: Fix broken error check in Parcel::readBlob
...
* commit '4335d35c71e777d42fbe8d53fa6b8fbc95d4c2b7':
2014-10-27 04:18:27 +00:00
Aravind Akella
ba8436feb6
am a046f506
: am 7830ef3d
: Change ordering of memory allocation and calling Thread::run().
...
* commit 'a046f506a52aa8fd0fe193b18fe283da83107f09':
2014-10-27 04:18:26 +00:00
Jesse Hall
6df480d989
am 5cc3b8b4
: am 78639c22
: Merge "Parcel: extra validation/debug code for writeDupFileDescriptor" into lmp-dev
...
* commit '5cc3b8b4c81c6e157f540a27e70559ee034e313d':
2014-10-27 04:18:26 +00:00
Aravind Akella
4c385eedff
am 021543fc
: am a7eb4b74
: Merge "Fix sockfd leakage in SensorService." into lmp-dev
...
* commit '021543fc657a7f21d1b143c68258282b35262906':
2014-10-27 04:18:25 +00:00
Riley Andrews
0e1e8ea337
am 8dcdf796
: am 6747be9f
: Generate the SurfaceFlinger shader cache on initialization
...
* commit '8dcdf7961b22ad36cb43d0f5353a1b5663448fd4':
2014-10-27 04:18:24 +00:00
Jesse Hall
16b65d4075
am 0c2da971
: am f05ef4e5
: Merge "Surface: cancel the dequeued buffer when requestBuffer fails" into lmp-dev
...
* commit '0c2da9719bde37305c5724e54f97a8f61c7e8d0b':
2014-10-27 04:18:24 +00:00
Lajos Molnar
09415821df
am be89b6f0
: am 0ba908e7
: Merge "add OMX_VIDEO_AVCLevel52 constant" into lmp-dev
...
* commit 'be89b6f0846d0ede5e6a4fed6115298285cdab60':
2014-10-27 04:18:23 +00:00
Michael Lentine
acc9223e2e
am df035b91
: am 36462d9d
: Merge "Add more logging for dup(fd) failure" into lmp-dev
...
* commit 'df035b91df50cf8a308121c43a2660f403b257ee':
2014-10-27 04:18:22 +00:00
Christopher Ferris
79108f28d7
am f625a249
: am a91968fd
: Merge "Accept socket connection before tracing." into lmp-dev
...
* commit 'f625a249b9a0de54eedf3fa0aaa549c1fb568298':
2014-10-27 04:18:22 +00:00
Michael Lentine
ae22c20a5b
am 20daf003
: am db57cfbd
: Merge "When eglMakeCurrent fails we need to fix the egl state." into lmp-dev
...
* commit '20daf003aaf1f01d5ef3cd60306db3cff89512c8':
2014-10-27 04:18:21 +00:00
Chong Zhang
a9100fcd36
am 30e4b31a
: am dd230cb8
: Merge "add a parameter for PCM limiter enable" into lmp-dev
...
* commit '30e4b31a8e3d189934842487f81cbbca8f74cbae':
2014-10-27 04:18:20 +00:00
Jesse Hall
27f8227977
am e245cdcc
: am 5bf786d8
: surfaceflinger: recompute visibility after sideband stream change
...
* commit 'e245cdcc004ee13920aa0b74790a2b5c758662a2':
2014-10-27 04:18:20 +00:00
Narayan Kamath
4c2a89d710
am 28da3288
: am cde4b13a
: Merge "Allow more than one dex2oat extra option"
...
* commit '28da32889bad10835eedd2a6c8ee50591b17e4e2':
2014-10-27 04:18:19 +00:00
Dianne Hackborn
66b3fc326e
am e4499526
: am 5ee2c9d2
: Work on issue #17656716 : Unhandled exception in Window Manager
...
* commit 'e4499526eee52a6584aba9382783e9fba327a9bc':
2014-10-27 04:18:17 +00:00
Aravind Akella
8adf97b146
am 112a7457
: am deb71b28
: Merge "Fix a possible SensorService deadlock." into lmp-dev
...
* commit '112a7457aedc694de9ba06359e738893e28c640a':
2014-10-27 04:18:17 +00:00
Jesse Hall
505bc90d8f
am 2a8ae4ef
: am bacc28ef
: surfaceflinger: Use landscape resolution for default dpi
...
* commit '2a8ae4ef70f2a3e0239a4df9bf33b4ff141594fe':
2014-10-27 04:18:16 +00:00
Aravind Akella
ee482b116e
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':
2014-10-27 04:18:15 +00:00
Michael Wright
9643649934
am cfbc3654
: am 4b20d402
: Merge "Only mark repeated keys as PASS_TO_USER if the original key was." into lmp-dev
...
* commit 'cfbc36544e8856d49d86f61de1a0815ceef4d395':
2014-10-27 04:18:15 +00:00
Jesse Hall
354ea330a0
am 1b5c8839
: am 728a8da1
: Merge "surfaceflinger: Check sideband stream changed to trigger sideband Layer update." into lmp-dev
...
* commit '1b5c8839f7bbdebb3b30a6584e67402e8cb4a979':
2014-10-27 04:18:14 +00:00
Aravind Akella
5c89b832f5
am 8b4869dc
: am 5105960d
: Fix sockfd leakage in SensorService. Remove sockfd from Looper when the connection is removed from mActiveConnections.
...
* commit '8b4869dc832b098bd8de1fb20bf36ff8ae9c4d28':
2014-10-27 04:18:14 +00:00
Michael Lentine
eb8191bfd2
am 53bffaaf
: am 12c4bdad
: Add rate-limited logging for unimplemented es functions.
...
* commit '53bffaaf277f8b9ebd1bffafe52f9a66b38fe792':
2014-10-27 04:18:13 +00:00
Dan Albert
412a9252ee
am 265f0d9d
: am 6ee97e74
: Merge "Fix a null dereference."
...
* commit '265f0d9dffb8b3d91c83991067abcd9684f2d712':
2014-10-27 04:18:12 +00:00
Lorenzo Colitti
9664ba1469
am 7a99e281
: am d9485403
: Merge "Include the VPN server IP address in the VPN state file." into lmp-dev
...
* commit '7a99e281dd367ff9bc107e59944d11399ac1deee':
2014-10-27 04:18:11 +00:00
Sean Wan
d785677d3a
am 0c6e249c
: am b1982b75
: am 60d31a0f
: am 3c648e37
: Update comment to use correct GPS file for wearable.
...
* commit '0c6e249cba71b1b24c6b344cdf8f17370dd871dc':
2014-10-27 04:18:10 +00:00
Lajos Molnar
e98c13ed66
am 435d9cde
: resolved conflicts for merge of 67d8bd66
to lmp-dev-plus-aosp
...
* commit '435d9cde2777950c1d93b0982839d6796c5688b2':
2014-10-27 04:18:09 +00:00
Unsuk Jung
ef04c72130
am 556888b8
: am 5bbf73ce
: Merge "Fix typo for android.hardware.audio.output feature in handheld device config" into lmp-dev
...
* commit '556888b8ba32d923351bfb2317232dd78fff9c26':
2014-10-27 04:18:09 +00:00
Aravind Akella
8509db4b4a
am c8a1b367
: am e225f6fd
: Merge "SensorService fixes." into lmp-dev
...
* commit 'c8a1b36745e2094e5fdc7915739caca396c2d9de':
2014-10-27 04:18:07 +00:00
Ihab Awad
b30d46dc2d
am 9b1543ad
: am 5430cead
: Add system feature for ConnectionService API support (2/3)
...
* commit '9b1543ad2f6f58aa116cf520378df12d46fbc037':
2014-10-27 04:18:06 +00:00
The Android Automerger
da3a013ca2
merge in lmp-mr1-release history after reset to 131866e1a4
2014-10-26 06:10:18 -07:00
The Android Automerger
af43237a4a
merge in lmp-mr1-release history after reset to 131866e1a4
2014-10-25 06:11:05 -07:00
Riley Andrews
0b91d7e277
am 131866e1
: Merge "Add glFlush in surfaceflinger screenshot code." into lmp-mr1-dev
...
* commit '131866e1a4cb3c592f923e95a8c1a66291e2057a':
Add glFlush in surfaceflinger screenshot code.
2014-10-24 18:39:16 +00:00