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
Riley Andrews
b9b24e503f
am 0b91d7e2
: am 131866e1
: Merge "Add glFlush in surfaceflinger screenshot code." into lmp-mr1-dev
...
* commit '0b91d7e27718fc530bcad78a7ff2a51b90142059':
Add glFlush in surfaceflinger screenshot code.
2014-10-24 18:43:37 +00: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
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
Jesse Hall
2d970420c5
am 11f2e08a
: am 8ad8c0a7
: am afe2b1fa
: surfaceflinger: don\'t close fence fds after passing to queueBuffer
...
* commit '11f2e08a66f2463cbfd9cbef5c34da7ddfe2613a':
surfaceflinger: don't close fence fds after passing to queueBuffer
2014-10-22 22:40:43 +00:00
Jesse Hall
11f2e08a66
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
2014-10-22 21:27:11 +00: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
Michael Lentine
2bb7270783
am 15b2ecf5
: am dcc959be
: Merge "Adding eglInitialize and eglTerminate image creation and deletion." into lmp-mr1-dev
...
* commit '15b2ecf599414c86cb198f3ffc126b50f88b5aa0':
Adding eglInitialize and eglTerminate image creation and deletion.
2014-10-21 18:43:47 +00:00
Michael Lentine
15b2ecf599
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.
2014-10-21 18:35:24 +00: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
Dmitriy Ivanov
68b769974d
am 8b81ce56
: am cb8a9fcc
: Merge "Switch to libsigchain.a"
...
* commit '8b81ce563f03500064e0f4c87288b8eeb3bed496':
Switch to libsigchain.a
2014-10-21 03:54:05 +00:00
Dmitriy Ivanov
8b81ce563f
am cb8a9fcc
: Merge "Switch to libsigchain.a"
...
* commit 'cb8a9fcc56288378d05d80c55396db7981e3828d':
Switch to libsigchain.a
2014-10-21 03:30:55 +00:00
Dmitriy Ivanov
5cf92d4a85
am cb8a9fcc
: Merge "Switch to libsigchain.a"
...
* commit 'cb8a9fcc56288378d05d80c55396db7981e3828d':
Switch to libsigchain.a
2014-10-21 03:30:18 +00:00
Dmitriy Ivanov
cb8a9fcc56
Merge "Switch to libsigchain.a"
2014-10-21 03:14:18 +00:00
Arve Hjønnevåg
d3d53043f5
am 54d613e3
: am bf46706f
: Merge "dumpstate: Add trusty version if driver is found" into lmp-mr1-dev
...
* commit '54d613e33c3c93382ac846509967bac2faf72047':
dumpstate: Add trusty version if driver is found
2014-10-20 22:12:59 +00:00
Arve Hjønnevåg
54d613e33c
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
2014-10-20 22:07:49 +00: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
4340a14fbf
Switch to libsigchain.a
...
Use LOCAL_WHOLE_STATIC_LIBRARIES to instruct static linker
to export symbols from the static library.
Change-Id: I0e41cf173be96c52cdad72b1ef4a1bf819e65dd2
2014-10-20 14:17:26 -07:00
Dmitriy Ivanov
0ea6f91cc1
am db618257
: am 042e5078
: Merge "Link sigchain to surfaceflinger main executable" into lmp-mr1-dev
...
* commit 'db61825743d5ad9069d9a4531c8a8854302f4520':
Link sigchain to surfaceflinger main executable
2014-10-20 18:35:48 +00:00
Dmitriy Ivanov
db61825743
am 042e5078
: Merge "Link sigchain to surfaceflinger main executable" into lmp-mr1-dev
...
* commit '042e5078f7444a68d22d706b66ba32efc220c263':
Link sigchain to surfaceflinger main executable
2014-10-20 18:28:14 +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
14942c8396
am 937052fb
: (-s ours) am a069e853
: am 649bafb7
: Merge "bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MERGE)" into lmp-dev
...
* commit '937052fb1ce8c2c5580e53d60ac771cb8fe7b532':
bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MERGE)
2014-10-20 14:36:43 +00:00
Jesse Hall
937052fb1c
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)
2014-10-20 14:31:38 +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
f35a5ba664
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:13:05 +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
Aravind Akella
f88c64809a
am f65fba5c
: am 899891ec
: am 0b6acb22
: Add version number to SensorService dump output.
...
* commit 'f65fba5cc9b88decc16660068edf878222ebb146':
Add version number to SensorService dump output.
2014-10-19 21:28:34 +00:00
Aravind Akella
f65fba5cc9
am 899891ec
: am 0b6acb22
: Add version number to SensorService dump output.
...
* commit '899891ec95c0581d35f47db7bdea75bd49fdca1b':
Add version number to SensorService dump output.
2014-10-19 21:23:55 +00: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
433fe2af0d
am 0b6acb22
: Add version number to SensorService dump output.
...
* commit '0b6acb2231baed861488f2d181621272d0658d25':
Add version number to SensorService dump output.
2014-10-19 21:05:16 +00:00
Aravind Akella
0b6acb2231
Add version number to SensorService dump output.
...
Change-Id: I64f9482ade523ec3fafe14bff14db7196e32413f
2014-10-19 20:30:58 +00: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
Dan Albert
0e978be998
am 3235d8e4
: am c52e54c4
: Merge "Some more test cleanup."
...
* commit '3235d8e477e1a0ad72d22acfff7d9966f882daa6':
Some more test cleanup.
2014-10-17 17:57:51 +00:00
Dan Albert
3235d8e477
am c52e54c4
: Merge "Some more test cleanup."
...
* commit 'c52e54c47184704613d446eb15d051ceb43d82b3':
Some more test cleanup.
2014-10-17 17:53:10 +00:00
Dan Albert
55833709ab
am c52e54c4
: Merge "Some more test cleanup."
...
* commit 'c52e54c47184704613d446eb15d051ceb43d82b3':
Some more test cleanup.
2014-10-17 17:53:05 +00:00
Dan Albert
c52e54c471
Merge "Some more test cleanup."
2014-10-17 17:43:58 +00:00
Narayan Kamath
6e6d754ecc
am 39efe3e5
: Clean up unused parameter warnings.
...
* commit '39efe3e5bf6282a4851e0eb3b938060c8f7790ae':
Clean up unused parameter warnings.
2014-10-17 11:22:05 +00:00