Commit Graph

50895 Commits

Author SHA1 Message Date
The Android Automerger
1ece08100d merge in lmp-mr1-release history after reset to 793fc0e13d 2014-11-03 06:11:11 -08:00
The Android Automerger
9bb99b2f23 merge in lmp-mr1-release history after reset to 793fc0e13d 2014-11-02 06:10:50 -08:00
The Android Automerger
ff6e40f889 merge in lmp-mr1-release history after reset to 793fc0e13d 2014-11-01 06:11:11 -07:00
Michael Lentine
793fc0e13d Merge "Fix crash when user provides large values in the Parcel." into lmp-mr1-dev 2014-10-31 23:37:47 +00:00
Michael Lentine
8afa1c4ab8 Fix crash when user provides large values in the Parcel.
Bug: 18102648
Change-Id: Ie6a24718e586a34424238363de80f9545951514f
2014-10-31 16:08:44 -07:00
Michael Lentine
9853685931 Merge "Fix output of pointers for 64bit devices." into lmp-mr1-dev 2014-10-31 18:39:23 +00:00
Michael Lentine
fae12d4fb4 Fix output of pointers for 64bit devices.
Change-Id: I279c1cf8d4c126b98f4a92ca807ade3749d01ff0
2014-10-31 11:08:19 -07:00
Jesse Hall
affc4d809e Merge "surfaceflinger: fix -Wunused-parameter warning" into lmp-mr1-dev 2014-10-31 16:59:45 +00:00
Jesse Hall
c7636f6062 Merge "surfaceflinger: fix -Wsign-compare warnings" into lmp-mr1-dev 2014-10-31 16:59:26 +00:00
Jesse Hall
6e74e3ccd9 Merge "surfaceflinger: fix -Woverloaded-virtual warning" into lmp-mr1-dev 2014-10-31 16:59:11 +00:00
Jesse Hall
04c9683aa1 Merge "surfaceflinger: fix -Wmismatched-tags warnings" into lmp-mr1-dev 2014-10-31 16:58:45 +00:00
Jesse Hall
7cd85979e8 surfaceflinger: fix -Wunused-parameter warning
warning: unused parameter 'mustRecompose' [-Wunused-parameter]

Change-Id: I6b8c671189639d851bfa5548742de988d6fa2687
(cherry picked from d2e514f717)
2014-10-31 09:52:42 -07:00
Jesse Hall
7844211607 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 f9bfdc6c94)
2014-10-31 09:52:23 -07:00
Jesse Hall
9b901805ed surfaceflinger: fix -Woverloaded-virtual warning
warning: 'android::LayerDim::isOpaque' hides overloaded virtual function
[-Woverloaded-virtual]

Change-Id: Ie27a6c943f485bc89ce11e424a4e7d99805d4dd0
(cherry picked from commit 382574d116)
2014-10-31 09:52:08 -07:00
Jesse Hall
1495ceb885 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 646f541050)
2014-10-31 09:51:10 -07:00
The Android Automerger
e47a752ac0 merge in lmp-mr1-release history after reset to 7b97351b68 2014-10-30 06:11:21 -07:00
Dan Stoza
7b97351b68 Merge "Initialize ARect fields in default ctor" into lmp-mr1-dev 2014-10-29 18:32:49 +00:00
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
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
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
131866e1a4 Merge "Add glFlush in surfaceflinger screenshot code." into lmp-mr1-dev 2014-10-24 18:30:07 +00:00
Riley Andrews
9707f4df64 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
2014-10-23 16:25:17 -07:00
The Android Automerger
a9ba83829e merge in lmp-mr1-release history after reset to 8ad8c0a775 2014-10-23 06:12:15 -07:00
Jesse Hall
8ad8c0a775 am afe2b1fa: surfaceflinger: don\'t close fence fds after passing to queueBuffer
* commit 'afe2b1fadd29149ceed639357e44e06e97c3a5ca':
  surfaceflinger: don't close fence fds after passing to queueBuffer
2014-10-22 20:45:35 +00:00
The Android Automerger
02e639d333 merge in lmp-mr1-release history after reset to dcc959beb7 2014-10-22 06:10:41 -07:00
Michael Lentine
dcc959beb7 Merge "Adding eglInitialize and eglTerminate image creation and deletion." into lmp-mr1-dev 2014-10-21 18:20:45 +00:00
Jesse Hall
afe2b1fadd 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
2014-10-21 11:11:53 -07:00
The Android Automerger
48ddeb7db7 merge in lmp-mr1-release history after reset to bf46706f36 2014-10-21 06:12:38 -07:00
Arve Hjønnevåg
bf46706f36 Merge "dumpstate: Add trusty version if driver is found" into lmp-mr1-dev 2014-10-20 21:58:27 +00:00
Dmitriy Ivanov
042e5078f7 Merge "Link sigchain to surfaceflinger main executable" into lmp-mr1-dev 2014-10-20 17:14:44 +00:00
Jesse Hall
a069e8532b 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)
2014-10-20 14:17:18 +00:00
Jesse Hall
649bafb7ba Merge "bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MERGE)" into lmp-dev 2014-10-20 13:59:25 +00:00
The Android Automerger
559935102f merge in lmp-mr1-release history after reset to 899891ec95 2014-10-20 06:10:37 -07:00
Aravind Akella
899891ec95 am 0b6acb22: Add version number to SensorService dump output.
* commit '0b6acb2231baed861488f2d181621272d0658d25':
  Add version number to SensorService dump output.
2014-10-19 21:14:54 +00:00
Aravind Akella
0b6acb2231 Add version number to SensorService dump output.
Change-Id: I64f9482ade523ec3fafe14bff14db7196e32413f
2014-10-19 20:30:58 +00:00
The Android Automerger
6fc658bac9 merge in lmp-mr1-release history after reset to 91c395f6c3 2014-10-19 06:09:58 -07:00
Jesse Hall
5b0cbcf946 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
2014-10-19 04:57:10 +00:00
The Android Automerger
86e63d6297 merge in lmp-mr1-release history after reset to 91c395f6c3 2014-10-18 06:11:01 -07:00
Arve Hjønnevåg
2db0f5f31c dumpstate: Add trusty version if driver is found
Change-Id: I7780ea8e1d777c222a73408f70d8a6d49dee1d92
2014-10-16 16:11:07 -07:00
Dmitriy Ivanov
2b1f2dac93 Link sigchain to surfaceflinger main executable
And export necessary symbols to preempt calls from libart.so

Bug: 15345057
Bug: 15426766

(cherry picked from commit f3da24d8cf)

Change-Id: I03b632e0bf2cbaf4a0e68cd0af4e991f7f6b08e4
2014-10-16 11:43:19 -07:00
The Android Automerger
5b2299bb01 merge in lmp-mr1-release history after reset to 91c395f6c3 2014-10-16 06:12:17 -07:00
Robin Lee
91c395f6c3 am 60fd3fee: Migrate CA certificates to all users
* commit '60fd3feecab4336d964ca8e31c7c3220e1afb558':
  Migrate CA certificates to all users
2014-10-15 23:25:00 +00:00
Robin Lee
60fd3feeca Migrate CA certificates to all users
Copies the /data/misc/keychain/cacert-* directories to all users on
the device, whereas previously they were simply copied to user 0.

This is a shallow copy so anything that wasn't supposed to be there
will disappear.

Bug: 17811821
Change-Id: Iae5909ab8d5efdb83c9c8fdf0e10ab7060d022cc
2014-10-15 19:04:33 +00:00
The Android Automerger
988df07865 merge in lmp-mr1-release history after reset to 53aad5e7de 2014-10-15 06:11:48 -07:00