OSDN Git Service
Adam Lesinski [Wed, 13 May 2015 00:35:48 +0000 (17:35 -0700)]
Verify that the native handle was created
The inputs to native_handle_create can cause an overflowed allocation,
so check the return value of native_handle_create before accessing
the memory it returns.
Bug:
19334482
Change-Id: I1f489382776c2a1390793a79dc27ea17baa9b2a2
Aravind Akella [Sat, 9 May 2015 00:17:40 +0000 (00:17 +0000)]
Merge "Fix the arguments to memcpy." into mnc-dev
Aravind Akella [Fri, 8 May 2015 22:59:23 +0000 (15:59 -0700)]
Fix the arguments to memcpy.
Change-Id: Ieaee26f46f43a9d412537047566178985370198b
Dan Stoza [Fri, 8 May 2015 16:32:26 +0000 (16:32 +0000)]
Merge "SF: Apply pending transactions to new sidebands" into mnc-dev
Pat Tjin [Thu, 7 May 2015 20:57:48 +0000 (20:57 +0000)]
Merge "surfaceflinger: Fix range check for getFormat" into mnc-dev
Ajay Dudani [Sun, 3 May 2015 18:44:55 +0000 (11:44 -0700)]
surfaceflinger: Fix range check for getFormat
Fix potential buffer overflow error in getFormat with indices
greater than MAX_HWC_DISPLAYS.
Change-Id: I5e5b69d8d043e900f5e33ca9a62e94ae5f857b68
Svet Ganov [Thu, 7 May 2015 17:50:59 +0000 (10:50 -0700)]
Fix broken NDK sensor manager API.
Change-Id: I21bb8b0dcfd3f1c812753a9fd77dea792e7155f2
Aaron Schulman [Wed, 25 Feb 2015 16:37:09 +0000 (08:37 -0800)]
Added Voltage and Current regulator ftrace events to atrace
Cherry-pick of
c2c6ecd1195481f5813a721a7d20a73c0795c135 from AOSP
Tracing the state of the voltage and current regulators enables a developer
to attribute power consumption measurements to specific perhipherals and
cores. Unlike other indirect methods of tracing when peripherals and cores
are toggled, the regulator ftrace event indicates the exact point in time
when the kernel switches on or off the device. For example, in the following
trace, a developer can see exactly when the krait2 core starts receiving
power, and and when the voltage is set for voltage scaling.
mpdecision-2172 [000] ...1 1566.665481: regulator_enable: name=krait2
mpdecision-2172 [000] ...1 1566.665493: regulator_enable_delay: name=krait2
mpdecision-2172 [000] ...1 1566.665495: regulator_enable_complete: name=krait2
<...>-4133 [002] ...1 1566.666891: regulator_set_voltage: name=krait2 (
1075000-
1100000)
Change-Id: Ia322206ef74496daf1d9baa03545d8e89e398487
Signed-off-by: Aaron Schulman <aschulman@google.com>
Dan Stoza [Tue, 5 May 2015 21:00:52 +0000 (14:00 -0700)]
SF: Apply pending transactions to new sidebands
When a Layer's sideband stream is set, apply any pending transactions.
Otherwise they would never be applied since sideband streams don't
trigger updates by pushing new buffers.
Bug:
20125898
Change-Id: I0c7a91cdf84e6205801f4ab64eee0b09e4c0b3e0
(cherry picked from commit
3b04e1383eca6cb1d43ebe23a421c427007690c7)
Dan Stoza [Mon, 4 May 2015 16:33:46 +0000 (16:33 +0000)]
Merge "libgui: Clear frame number while freeing slot" into mnc-dev
Sasha Levitskiy [Sun, 3 May 2015 04:03:44 +0000 (21:03 -0700)]
SensorServiceTest: Fix build, warnings.
Change-Id: I3ed5247d3eb6c43d185049cf9011c2ee01b5662e
Signed-off-by: Sasha Levitskiy <sanek@google.com>
Dan Stoza [Fri, 1 May 2015 23:42:55 +0000 (16:42 -0700)]
libgui: Clear frame number while freeing slot
Clears the frame number of a slot when it is freed, since it is used
to determine if a released buffer is stale.
Bug:
20445852
Change-Id: I02415e7b25a1eafe7414d6eb1cedf62ac5543cd9
Svetoslav [Fri, 1 May 2015 23:10:55 +0000 (23:10 +0000)]
Merge "Add body sensors app op - framework native" into mnc-dev
Mark Salyzyn [Thu, 30 Apr 2015 16:49:41 +0000 (09:49 -0700)]
dumpstate: report per-partition MMC performance
(Cherry pick from commit
540e3de99fa1baa5eaf3eb3d49f4e98fd9f5bd91)
Change-Id: If5cabe186d8377056effa1c0672a90e277cd7221
Dan Stoza [Fri, 1 May 2015 21:44:06 +0000 (21:44 +0000)]
Merge "SurfaceFlinger: Fix PTS on stale buffers" into mnc-dev
Svetoslav [Wed, 29 Apr 2015 23:50:41 +0000 (16:50 -0700)]
Add body sensors app op - framework native
Change-Id: I727a2bb1e28ae9158f2df9c74dd0aee977dfd47f
Dan Stoza [Tue, 28 Apr 2015 21:42:06 +0000 (14:42 -0700)]
SurfaceFlinger: Fix PTS on stale buffers
SurfaceFlinger's (Layer's) shadow copy of the BufferQueue queue was
getting out of sync for a few reasons. This change fixes these by
doing the following:
- Adds a check to re-synchronize the shadow copy every time we
successfully acquire a buffer by first dropping stale buffers before
removing the current buffer.
- Avoids trying to perform updates for buffers which have been rejected
(for incorrect dimensions) by SurfaceFlinger.
- Adds IGraphicBufferConsumer::setShadowQueueSize, which allows the
consumer to notify the BufferQueue that it is maintaining a shadow
copy of the queue and prevents it from dropping so many buffers
during acquireBuffer that it ends up returning a buffer for which the
consumer has not yet received an onFrameAvailable call.
Bug:
20096136
Change-Id: I78d0738428005fc19b3be85cc8f1db498043612f
(cherry picked from commit
2e36f2283f48ab764b496490c73a132acf21df3a)
Jeff Sharkey [Fri, 1 May 2015 16:22:40 +0000 (16:22 +0000)]
Merge "Offer to move both code and data together." into mnc-dev
Jeff Sharkey [Thu, 30 Apr 2015 22:58:19 +0000 (15:58 -0700)]
Offer to move both code and data together.
We now move code under /data/app/com.example when a complete move
is requested. This really only works for new cluster-style installs
that also have native libraries and OAT contained inside.
Teach measuring code about cluster-style installs when measuring
app footprint. Also offer to measure private data space for all
users.
Bug:
19993667,
20275578
Change-Id: I6df7b947cb5cc8a4552f56f4b64a661e8512389f
Dan Stoza [Thu, 30 Apr 2015 22:12:46 +0000 (22:12 +0000)]
Merge "SurfaceFlinger: Limit to 4k Layers" into mnc-dev
Dan Stoza [Thu, 30 Apr 2015 20:29:25 +0000 (13:29 -0700)]
SurfaceFlinger: Limit to 4k Layers
Sets a limit of 4k Layers which SurfaceFlinger will allow to be in
existence at any given time. An attempt to create Layers in excess of
this limit will fail with NO_MEMORY.
Bug:
20674586
Change-Id: I2dfaf59643d826f982b2fa44e8a9ed643176d972
(cherry picked from commit
e7f8dde3f3c398c1ea1bec14e76725a760f71d31)
Dan Stoza [Thu, 30 Apr 2015 21:59:39 +0000 (21:59 +0000)]
Merge "SurfaceFlinger: Fix integer overflow in Mesh ctor" into mnc-dev
Dan Stoza [Wed, 29 Apr 2015 20:30:31 +0000 (13:30 -0700)]
SurfaceFlinger: Fix integer overflow in Mesh ctor
Performs range checking on the inputs to Mesh::Mesh() before allocating
the storage array.
Bug:
20674682
Change-Id: I4fc918a8c312d967dd6d9f91a098b2e0a7081027
(cherry picked from commit
ab79e33ef3a21a2b14bf15bc4c85aef247b4ad95)
Taiju Tsuiki [Thu, 30 Apr 2015 13:15:33 +0000 (22:15 +0900)]
Close Fence FDs in error cases of Surface and GraphicBufferMapper
Surface::{cancel,queue}Buffer and GraphicBufferMapper::lockAsyncYCbCr take the
ownership of |fenceFd|s. Though they don't close it on error cases.
Change-Id: I49a7ce8837d5c510c4ac4ad4649f310d18610e80
(cherry picked from commit
c7263fb43297744eb04b11025424c0c526d5584c)
Taiju Tsuiki [Thu, 30 Apr 2015 13:13:14 +0000 (22:13 +0900)]
Avoid closing invalid FD in Surface and GraphicBufferMapper
GraphicBufferMapper::lockAsync{,YCbCr} close the fence FD even when the FD
is invalid.
Change-Id: Ia2b4dae3b2c06426e34f623f19ba92435f486ab7
(cherry picked from commit
dcfe91e1f3f15b68793a69650f9bd0ca6a58ff4c)
Svet Ganov [Wed, 29 Apr 2015 19:34:17 +0000 (19:34 +0000)]
Merge "Respect the record audio app op - frameworks native" into mnc-dev
Alan Viverette [Wed, 29 Apr 2015 16:38:56 +0000 (16:38 +0000)]
Merge "Remove gamma correction from color correction shader" into mnc-dev
Nick Kralevich [Tue, 28 Apr 2015 23:21:30 +0000 (16:21 -0700)]
Parcel.cpp: use calloc instead of malloc
(cherrypicked from commit
6329f0199ed04030e6c2bd7aecd036387b732c71)
Bug:
20669363
Change-Id: Ia4c8d8ca9d8b4b87954d7267e8b1c94cf4e570e1
Ashish Sharma [Wed, 29 Apr 2015 02:37:06 +0000 (02:37 +0000)]
Merge "Inclide checkin format of dumpsys package in bugreport." into mnc-dev
Alan Viverette [Wed, 29 Apr 2015 00:15:57 +0000 (17:15 -0700)]
Remove gamma correction from color correction shader
Gamma correction was incorrectly skewing both color inversion and
Daltonization, which resulted in washed-out colors.
Bug:
20346301
Change-Id: I34d879f902c3be115b2d23f09c3ed3902799759e
Svet Ganov [Tue, 28 Apr 2015 19:09:01 +0000 (12:09 -0700)]
Respect the record audio app op - frameworks native
Change-Id: Id747767377953fd644a538aad3f603d6c50875a2
Dan Stoza [Tue, 28 Apr 2015 21:20:04 +0000 (14:20 -0700)]
libgui: Fix buffer age on 64-bit targets
Changes a %llu to a PRIu64 to fix compilation on 64-bit targets.
Change-Id: I8ba982662dbe8ee2e1e47c4f6ce4bbdbe2020960
Dan Stoza [Thu, 26 Feb 2015 00:49:08 +0000 (16:49 -0800)]
BufferQueue: Add NATIVE_WINDOW_BUFFER_AGE query
Adds a NATIVE_WINDOW_BUFFER_AGE query, which returns the age of the
contents of the most recently dequeued buffer as the number of frames
that have elapsed since it was last queued.
Change-Id: Ib6fd62945cb62d1e60133a65beee510363218a23
(cherry picked from commit
49f810c72df8d1d64128e376757079825c8decd4)
Ashish Sharma [Tue, 28 Apr 2015 20:32:54 +0000 (13:32 -0700)]
Inclide checkin format of dumpsys package in bugreport.
Change-Id: I809377f80e314b358eba22fa916e53c81cac2c47
Dan Stoza [Tue, 28 Apr 2015 20:18:07 +0000 (13:18 -0700)]
libgui: Implement onTransact for sideband streams
Implements the GET_SIDEBAND_STREAM case of
IGraphicBufferConsumer::onTransact
Change-Id: I46138b87ce2d70dde48b3561dcd378ce5fd8f383
(cherry picked from commit
17166698d935a004adab216aca83a585f91e9d96)
Dan Stoza [Mon, 27 Apr 2015 18:06:01 +0000 (11:06 -0700)]
libgui: Change detachNextBuffer to return sp<GB>
Changes Surface::detachNextBuffer to return an sp<GraphicBuffer>
instead of an ANativeWindowBuffer* to ensure that reference counting
works correctly.
Bug:
20092217
Change-Id: I3979ea6121aaf14845f0554477b778770413581e
(cherry picked from commit
8b2daa3ca29492b181fb67840640d771c4a2b3ac)
Aravind Akella [Sat, 25 Apr 2015 03:30:09 +0000 (20:30 -0700)]
Build fix SensorEventQueue.
Change-Id: I3e6ba031d42bd37067591771f378b7185169ab48
Aravind Akella [Sat, 25 Apr 2015 02:40:50 +0000 (19:40 -0700)]
Build fix change method signature of enableDataInjection.
Change-Id: I3927aec64f5a1555d2e5d07591fd04e7b3be5f09
Aravind Akella [Sat, 25 Apr 2015 01:40:34 +0000 (01:40 +0000)]
Merge "Enable data injection mode in SensorService."
Lajos Molnar [Fri, 24 Apr 2015 20:28:18 +0000 (13:28 -0700)]
OMX: add event for rendering an output frame by a tunneled decoder
Bug:
20503131
Change-Id: Ia5cc7629244c986f059a3571be1d8aca87006e02
Dan Stoza [Fri, 24 Apr 2015 16:33:38 +0000 (16:33 +0000)]
am
5d10894c: am
ef47c080: am
958f5011: Merge "libgui: Allow an IGBProducer to disable allocation"
* commit '
5d10894c9d547449cf231f02b736da9dfdebec11':
libgui: Allow an IGBProducer to disable allocation
Dan Stoza [Fri, 24 Apr 2015 16:33:37 +0000 (16:33 +0000)]
am
437fb850: am
f96a7581: am
fb6d43ff: Merge "libgui: Change BufferQueue to use free lists"
* commit '
437fb850b0667be3e8655cb1ac6a8d491f59d045':
libgui: Change BufferQueue to use free lists
Dan Stoza [Fri, 24 Apr 2015 16:12:30 +0000 (16:12 +0000)]
am
ef47c080: am
958f5011: Merge "libgui: Allow an IGBProducer to disable allocation"
* commit '
ef47c080fd0e7fb8bf1fc4b0ecadae277a22f2cf':
libgui: Allow an IGBProducer to disable allocation
Dan Stoza [Fri, 24 Apr 2015 16:12:29 +0000 (16:12 +0000)]
am
f96a7581: am
fb6d43ff: Merge "libgui: Change BufferQueue to use free lists"
* commit '
f96a758139be0d5c298abad8e27083b0f0849818':
libgui: Change BufferQueue to use free lists
Dan Stoza [Fri, 24 Apr 2015 16:00:22 +0000 (16:00 +0000)]
am
958f5011: Merge "libgui: Allow an IGBProducer to disable allocation"
* commit '
958f501189a29e53767f41bc8172e4af8d1ce2bf':
libgui: Allow an IGBProducer to disable allocation
Dan Stoza [Fri, 24 Apr 2015 16:00:21 +0000 (16:00 +0000)]
am
fb6d43ff: Merge "libgui: Change BufferQueue to use free lists"
* commit '
fb6d43ff44bb2b708494749a7f6037505ccd7bf6':
libgui: Change BufferQueue to use free lists
Dan Stoza [Fri, 24 Apr 2015 15:50:09 +0000 (15:50 +0000)]
Merge "libgui: Allow an IGBProducer to disable allocation"
Dan Stoza [Fri, 24 Apr 2015 15:48:37 +0000 (15:48 +0000)]
Merge "libgui: Change BufferQueue to use free lists"
Aravind Akella [Fri, 17 Apr 2015 01:57:31 +0000 (18:57 -0700)]
Enable data injection mode in SensorService.
Change-Id: I0cd32a017235c31c54816e4a357ce3b988350ed6
Dan Stoza [Thu, 23 Apr 2015 23:44:33 +0000 (23:44 +0000)]
am
65f68d5c: am
fece8306: am
56f1f16c: Merge "libgui: Fix some bitrot/warnings in tests"
* commit '
65f68d5cb4a758a8e6faac95817f70383748a9c0':
libgui: Fix some bitrot/warnings in tests
Dan Stoza [Thu, 23 Apr 2015 23:44:32 +0000 (23:44 +0000)]
am
17df593e: am
9aae16a4: am
82e4d49b: Merge "libui/libgui: Fix errors in parceling"
* commit '
17df593eb386940a26377d2db9fcb8a60e8badba':
libui/libgui: Fix errors in parceling
Dan Stoza [Thu, 23 Apr 2015 23:13:56 +0000 (23:13 +0000)]
am
fece8306: am
56f1f16c: Merge "libgui: Fix some bitrot/warnings in tests"
* commit '
fece83060e9640636f00a97fe236aff353d78c71':
libgui: Fix some bitrot/warnings in tests
Dan Stoza [Thu, 23 Apr 2015 23:13:56 +0000 (23:13 +0000)]
am
9aae16a4: am
82e4d49b: Merge "libui/libgui: Fix errors in parceling"
* commit '
9aae16a47d727a2650af0f0892657b41bd88215d':
libui/libgui: Fix errors in parceling
Dan Stoza [Thu, 23 Apr 2015 23:02:49 +0000 (23:02 +0000)]
am
56f1f16c: Merge "libgui: Fix some bitrot/warnings in tests"
* commit '
56f1f16c7b01a53282d483259ae80d035cc6496b':
libgui: Fix some bitrot/warnings in tests
Dan Stoza [Thu, 23 Apr 2015 23:02:48 +0000 (23:02 +0000)]
am
82e4d49b: Merge "libui/libgui: Fix errors in parceling"
* commit '
82e4d49b0ecb205d49f02cc07496f7508c56443c':
libui/libgui: Fix errors in parceling
Dan Stoza [Thu, 23 Apr 2015 22:53:36 +0000 (22:53 +0000)]
Merge "libgui: Fix some bitrot/warnings in tests"
Dan Stoza [Thu, 23 Apr 2015 22:51:00 +0000 (22:51 +0000)]
Merge "libui/libgui: Fix errors in parceling"
Dan Stoza [Fri, 17 Apr 2015 00:28:43 +0000 (17:28 -0700)]
libgui: Allow an IGBProducer to disable allocation
Adds a new method IGBP::allowAllocation, which controls whether
dequeueBuffer is permitted to allocate a new buffer. If allocation is
disallowed, dequeueBuffer will block or return an error as it
normally would (as controlled by *ControlledByApp).
If there are free buffers, but they are not of the correct dimensions,
format, or usage, they may be freed if a more suitable buffer is not
found first.
Bug:
19801715
Change-Id: I0d604958b78b2fd775c2547690301423f9a52165
Dan Stoza [Thu, 23 Apr 2015 20:20:51 +0000 (13:20 -0700)]
libgui: Change BufferQueue to use free lists
BufferQueue used to choose free buffers by scanning through its array
of slots and picking one based on timestamp. This changes that
mechanism to use a pair of free lists: one with buffers attached and
one without. This makes it easier to choose either type of free slot
depending on the needs of the current operation.
Fixes an issue with the first version of this change, found in bugs
20482952,
20443314, and
20464549.
Bug:
13175420
Change-Id: I9b6e83cfe8f9b4329a976025cb8e291d51fb6d4a
Dan Stoza [Thu, 23 Apr 2015 02:17:42 +0000 (02:17 +0000)]
am
423b40f7: am
368270fd: am
de5c15b8: Merge "SF: Always perform sideband transactions"
* commit '
423b40f7bd004a8ab5bca887e3855cd20c6bcc28':
SF: Always perform sideband transactions
Dan Stoza [Thu, 23 Apr 2015 00:17:59 +0000 (00:17 +0000)]
am
368270fd: am
de5c15b8: Merge "SF: Always perform sideband transactions"
* commit '
368270fd6d4681d2de5502ffc6194ade9a13e65a':
SF: Always perform sideband transactions
Dan Stoza [Thu, 23 Apr 2015 00:06:03 +0000 (00:06 +0000)]
am
de5c15b8: Merge "SF: Always perform sideband transactions"
* commit '
de5c15b8bd12143829d043fa4ab457600e5682b3':
SF: Always perform sideband transactions
Dan Stoza [Wed, 22 Apr 2015 23:57:28 +0000 (23:57 +0000)]
Merge "SF: Always perform sideband transactions"
Dan Stoza [Wed, 22 Apr 2015 21:59:08 +0000 (14:59 -0700)]
SF: Always perform sideband transactions
On normal Layers, we defer applying resize transactions until a buffer
of the correct size arrives. This breaks with sideband streams, because
buffers are not seen by SurfaceFlinger. This change applies
transactions immediately for Layers which have a sideband stream
attached to avoid that problem.
Bug:
20428254
Change-Id: I379d8aaef460d467cdf8432764b4a504928fb65a
(cherry picked from commit
c300b8b506536e1bf94ffd8a3b75d46e776923e0)
Dan Stoza [Wed, 22 Apr 2015 22:18:58 +0000 (22:18 +0000)]
am
41422980: am
d2c12e4c: am
7637e35d: Merge "Revert "libgui: Change BufferQueue to use free lists""
* commit '
41422980fabb087390791d951c28fef072d93be1':
Revert "libgui: Change BufferQueue to use free lists"
Dan Stoza [Wed, 22 Apr 2015 19:17:56 +0000 (19:17 +0000)]
am
d2c12e4c: am
7637e35d: Merge "Revert "libgui: Change BufferQueue to use free lists""
* commit '
d2c12e4cd394ab9ed642526f8bd0e1b3acd692ae':
Revert "libgui: Change BufferQueue to use free lists"
Dan Stoza [Wed, 22 Apr 2015 19:07:10 +0000 (19:07 +0000)]
am
7637e35d: Merge "Revert "libgui: Change BufferQueue to use free lists""
* commit '
7637e35d17e06d532b0d2d11c0eef60594726209':
Revert "libgui: Change BufferQueue to use free lists"
Dan Stoza [Wed, 22 Apr 2015 18:59:01 +0000 (18:59 +0000)]
Merge "Revert "libgui: Change BufferQueue to use free lists""
Dan Stoza [Wed, 22 Apr 2015 18:57:39 +0000 (18:57 +0000)]
Revert "libgui: Change BufferQueue to use free lists"
This reverts commit
8dddc990103b71137be2a6365a26b1ac36598e68.
Change-Id: I0b0fed9f1394c6f6ae812f6c562ead4473a8226e
Dan Stoza [Wed, 22 Apr 2015 00:47:35 +0000 (00:47 +0000)]
am
3805a00d: am
91f16b1b: am
e647ddde: Merge "libgui: Fix CPU rendering on Surface"
* commit '
3805a00d6efef02535aaed96f412e0c55a9875f8':
libgui: Fix CPU rendering on Surface
Dan Stoza [Wed, 22 Apr 2015 00:30:31 +0000 (00:30 +0000)]
am
91f16b1b: am
e647ddde: Merge "libgui: Fix CPU rendering on Surface"
* commit '
91f16b1b9c12e897d15198953684d9c7731ca47a':
libgui: Fix CPU rendering on Surface
Wale Ogunwale [Wed, 22 Apr 2015 00:27:30 +0000 (00:27 +0000)]
Merge "Fixed build error with clang/llvm."
Dan Stoza [Wed, 22 Apr 2015 00:17:33 +0000 (00:17 +0000)]
am
e647ddde: Merge "libgui: Fix CPU rendering on Surface"
* commit '
e647dddebb11a383c0d95b6dfd0cbe0998d9b644':
libgui: Fix CPU rendering on Surface
Dan Stoza [Wed, 22 Apr 2015 00:07:51 +0000 (00:07 +0000)]
Merge "libgui: Fix CPU rendering on Surface"
Dan Stoza [Tue, 21 Apr 2015 23:42:49 +0000 (16:42 -0700)]
libgui: Fix CPU rendering on Surface
When the surface damage code went in, it incorrectly assumed that if
an application was doing CPU rendering, it would be using lock and
unlockAndPost instead of dequeue and queue, so it repurposed the dirty
region too aggressively. This change keeps it from clobbering the
dirty region if a CPU producer is attached.
Bug:
20431815
Change-Id: Id4dfd71378311ea822f0289f6de2d20a7bd84014
Michael Wright [Tue, 21 Apr 2015 21:46:31 +0000 (21:46 +0000)]
Merge "Default to TOOL_TYPE_STYLUS for external stylus events."
Michael Wright [Tue, 21 Apr 2015 21:45:13 +0000 (22:45 +0100)]
Increase stylus data timeout.
Temporarily increase the stylus timeout while we figure out where the
delay in BT information is coming from.
Change-Id: I27ab5a4db4ad14358c6e6803961612420371fce9
Michael Wright [Tue, 21 Apr 2015 18:01:58 +0000 (19:01 +0100)]
Default to TOOL_TYPE_STYLUS for external stylus events.
Change-Id: Ife6a7c4802e8b1ec1ff8445e639f8a6d90a00592
Michael Wright [Tue, 21 Apr 2015 21:37:02 +0000 (22:37 +0100)]
Revert "Increase stylus data timeout."
This reverts commit
8b0673ce0ca97952d3ed9cb8912b31f367e41c0c.
Michael Wright [Tue, 21 Apr 2015 21:23:44 +0000 (21:23 +0000)]
Merge "Increase stylus data timeout."
Wale Ogunwale [Tue, 21 Apr 2015 19:29:50 +0000 (12:29 -0700)]
Fixed build error with clang/llvm.
Change-Id: Ideacdc974ebad542df724464ccba9fcfb2b7ea91
Joseph Cooper [Tue, 21 Apr 2015 15:31:41 +0000 (15:31 +0000)]
Merge "Introduces navigation keycodes."
Dan Sandler [Tue, 21 Apr 2015 14:10:17 +0000 (14:10 +0000)]
Merge "Add ashmem stats to Parcels"
Michael Wright [Tue, 21 Apr 2015 14:06:43 +0000 (15:06 +0100)]
Increase stylus data timeout.
Sometimes stylus data will be delayed by 30 - 40ms. By increasing the
timeout we pretty much always pick up stylus data and the touch
latency feels surprisingly small.
Change-Id: I39f5b9037ce0444b1e957149d3f1c3a3137804cb
Michael Wright [Mon, 20 Apr 2015 22:35:36 +0000 (22:35 +0000)]
Merge "Always update external stylus state."
Michael Wright [Mon, 20 Apr 2015 21:03:54 +0000 (22:03 +0100)]
Always update external stylus state.
This prevents us from dropping any states (namely the pressure
transition from non-zero to zero) if we get the touch up before we
get the stylus data.
Change-Id: Ifc198628d35b7079dc5ec23d81f9681d122757a0
Dan Stoza [Mon, 20 Apr 2015 20:59:55 +0000 (20:59 +0000)]
am
aadb236d: am
483c76dc: am
ff5c1a6b: Merge "libgui: Change BufferQueue to use free lists"
* commit '
aadb236d2e944791c1e7600eae9439fcb8a6caa9':
libgui: Change BufferQueue to use free lists
Dan Stoza [Mon, 20 Apr 2015 20:35:50 +0000 (20:35 +0000)]
am
483c76dc: am
ff5c1a6b: Merge "libgui: Change BufferQueue to use free lists"
* commit '
483c76dcb855fe87adc670c0a0ea1e1ce237dd81':
libgui: Change BufferQueue to use free lists
Dan Stoza [Mon, 20 Apr 2015 20:24:58 +0000 (20:24 +0000)]
am
ff5c1a6b: Merge "libgui: Change BufferQueue to use free lists"
* commit '
ff5c1a6b677d8d25630ffc3d1a868eb98a38ceab':
libgui: Change BufferQueue to use free lists
Dan Stoza [Mon, 20 Apr 2015 19:09:38 +0000 (12:09 -0700)]
libgui: Fix some bitrot/warnings in tests
These tests hadn't been run in a while and had accumulated some rot.
This fixes most of the compile warnings and some tests which fail
incorrectly, but 2 failures remain on N6.
Change-Id: I7fee78cd058a32f4d7df40ec9f899ff767f68517
Dan Stoza [Mon, 20 Apr 2015 19:07:13 +0000 (12:07 -0700)]
libui/libgui: Fix errors in parceling
BufferItem and GraphicBuffer were not parceling correctly, which had
not been noticed because the libgui tests (specifically, one that
tests placing a BufferQueue in a separate process from the IGBP/C)
had not been run recently. This change fixes the errors found in
those classes.
Change-Id: Ie224361a534a79115a3481d83ff97f21d154d4f5
Dan Stoza [Mon, 20 Apr 2015 20:14:13 +0000 (20:14 +0000)]
Merge "libgui: Change BufferQueue to use free lists"
Michael Wright [Fri, 17 Apr 2015 17:35:15 +0000 (18:35 +0100)]
Mark all InputReaderContext methods as pure virtual
Also, fix the build.
Change-Id: I45d3daa8c0710b2f9421e8ffd011d2d39c05e030
Michael Wright [Sat, 14 Mar 2015 00:32:02 +0000 (17:32 -0700)]
Fuse stylus and touch screen data.
TODO: Ensure we dispatch new pressure and button data when stylus
is stationary.
Change-Id: I10a665a9b81ff4b9acd01bf72f0fc2e0c2abc203
Dan Stoza [Thu, 16 Apr 2015 22:39:18 +0000 (15:39 -0700)]
libgui: Change BufferQueue to use free lists
BufferQueue used to choose free buffers by scanning through its array
of slots and picking one based on timestamp. This changes that
mechanism to use a pair of free lists: one with buffers attached and
one without. This makes it easier to choose either type of free slot
depending on the needs of the current operation.
Bug:
13175420
Change-Id: Ic8398e7511bd11a60a1c82e3ad2ee271c9822be1
Tim Kilbourn [Mon, 6 Apr 2015 20:48:50 +0000 (13:48 -0700)]
Add method stubs for input device properties.
Change-Id: Icd785cb55ae2b225102fa249240837a91a41aae3
Joseph Cooper [Wed, 15 Apr 2015 23:45:18 +0000 (16:45 -0700)]
Introduces navigation keycodes.
These four new navigation keycodes are intended to be used to
navigate a tree hierarchy or list of items. They should be used to
allow the user to advance forward or backward within a list of
sibling items, expand the currently selected item to navigate the
item's children, or back out from the current item to its parent
item or state.
Change-Id: I4781e9d7756ed00ca14d8d4c743da3cc0e68ea6c
Dan Sandler [Fri, 10 Apr 2015 14:08:45 +0000 (10:08 -0400)]
Add ashmem stats to Parcels
Requires change Ifaf115da in frameworks/base.
Bug:
20079551
Change-Id: Ifaf115dabd1a59cdb1b46e2d49c41f64ac107de4
Vinit Deshpande [Thu, 16 Apr 2015 02:36:02 +0000 (02:36 +0000)]
Merge "am
e06cba2..
e06cba2 from mirror-m-wireless-internal-release"
Dan Stoza [Wed, 15 Apr 2015 22:16:03 +0000 (22:16 +0000)]
am
66dc4ee3: am
b47584f4: am
2e398e64: Merge "SF: Permit changing DispSync offsets at runtime"
* commit '
66dc4ee3729c4e6fea624805a1e58843ce920477':
SF: Permit changing DispSync offsets at runtime