OSDN Git Service

android-x86/frameworks-native.git
8 years agoInputReader: add 5-point calibration
Chih-Wei Huang [Sat, 1 Nov 2014 17:21:12 +0000 (01:21 +0800)]
InputReader: add 5-point calibration

Updated for Android 5.0.

8 years agoauto determine the density if not provided in surfaceflinger
Chih-Wei Huang [Sun, 26 Oct 2014 07:39:53 +0000 (15:39 +0800)]
auto determine the density if not provided in surfaceflinger

We hope to support tablet UI for different resolutions.
So adjust the density according to the resolution.

8 years agoenable console management
Chih-Wei Huang [Sun, 26 Oct 2014 07:38:15 +0000 (15:38 +0800)]
enable console management

The console management was removed since ICS. But it's useful for debugging.
Re-implement it based on the original class ConsoleManagerThread of class
DisplayHardwareBase.

8 years agoSurfaceFlinger: Add NULL check for buffer handling
Praveena Pachipulusu [Thu, 21 Nov 2013 13:27:31 +0000 (18:57 +0530)]
SurfaceFlinger: Add NULL check for buffer handling

Add buffer handling NULL check in dequeueBuffer and
verify whether the output data from binder is not NULL
in queueBuffer and connect api's to avoid SF crash

CRs-Fixed: 573088
CRs-Fixed: 572315

Change-Id: I41cebbc0cbcbbb0fd5ecb38db7ec7b0c91cdffe9

8 years agosurfaceflinger: Set max acquired buffer count
Naseer Ahmed [Tue, 19 Nov 2013 19:11:26 +0000 (14:11 -0500)]
surfaceflinger: Set max acquired buffer count

If triple framebuffers are enabled, the number of acquired
buffers isn't increased by default. Set the count to one less
than the max buffers to make sure all three buffers come into
play.

Change-Id: I65054ed4004607f5be68c893f6f621e821cfbf1c

8 years agoSurface: Initialize variable and add a defensive check
Rama Vaddula [Thu, 12 Sep 2013 21:09:32 +0000 (14:09 -0700)]
Surface: Initialize variable and add a defensive check

Initialize buf variable and make sure to check for return
value of dequeueBuffer() before sending to the client.

Change-Id: I0569f2d45825fab0e5d0f38fc91a07990f57c7ab
(cherry picked from commit a6bd7106a7305208f187fbf0a48f14139e33c9d6)
(cherry picked from commit e5d7662d68c5be2b282edd58d4feb68a4d476182)
(cherry picked from commit 885c146144480d4371a0a97df89b8e77f53d3d94)

8 years agoCheck fence is not NULL before dereferencing it
Lynus Vaz [Tue, 23 Jul 2013 12:49:02 +0000 (18:19 +0530)]
Check fence is not NULL before dereferencing it

If the fence obtained in dequeueBuffer is NULL, don't dereference it.
This will avoid a crash in surfaceflinger.

CRs-fixed: 516300
Change-Id: I3054dc37087103f3addae7884bb03460484a1eec
(cherry picked from commit ddf4adb487dc76ccb75fe2432772d6fc575ed77c)
(cherry picked from commit c6ae5271f9ced9a747e1481c2ef875ba03674172)
(cherry picked from commit cdad709878601eb694acbce7d3ae9f7a74bf14f3)

8 years agodisables hardware acceleration if debug.egl.hw=0
Chih-Wei Huang [Sun, 6 Jan 2013 08:56:00 +0000 (16:56 +0800)]
disables hardware acceleration if debug.egl.hw=0

8 years agoAdded option to disable touchscreen pressure sensitivity from idc files
Edward Peek [Tue, 3 Apr 2012 18:17:00 +0000 (06:17 +1200)]
Added option to disable touchscreen pressure sensitivity from idc files

8 years agoSupport old single-touch touchscreens with BTN_LEFT
DanielK [Tue, 20 Mar 2012 06:28:43 +0000 (14:28 +0800)]
Support old single-touch touchscreens with BTN_LEFT

8 years agoFix issue #27252896: Security Vulnerability -- weak binder
Dianne Hackborn [Mon, 21 Mar 2016 17:36:54 +0000 (10:36 -0700)]
Fix issue #27252896: Security Vulnerability -- weak binder

Sending transaction to freed BBinder through weak handle
can cause use of a (mostly) freed object.  We need to try to
safely promote to a strong reference first.

Change-Id: Ic9c6940fa824980472e94ed2dfeca52a6b0fd342
(cherry picked from commit c11146106f94e07016e8e26e4f8628f9a0c73199)

8 years agoBQ: fix some uninitialized variables
Pablo Ceballos [Wed, 16 Mar 2016 01:10:49 +0000 (18:10 -0700)]
BQ: fix some uninitialized variables

Bug 27555981
Bug 27556038

Change-Id: I436b6fec589677d7e36c0e980f6e59808415dc0e

8 years agoAdd SN logging
Pablo Ceballos [Sat, 20 Feb 2016 19:26:13 +0000 (11:26 -0800)]
Add SN logging

Bug 27046057

Change-Id: Iede7c92e59e60795df1ec7768ebafd6b090f1c27

8 years agoSanity check IMemory access versus underlying mmap
Christopher Tate [Sat, 6 Feb 2016 03:02:56 +0000 (19:02 -0800)]
Sanity check IMemory access versus underlying mmap

Bug 26877992

Change-Id: Ibbf4b1061e4675e4e96bc944a865b53eaf6984fe

8 years agoBQ: Add permission check to BufferQueueConsumer::dump
Pablo Ceballos [Fri, 12 Feb 2016 02:01:49 +0000 (18:01 -0800)]
BQ: Add permission check to BufferQueueConsumer::dump

Bug 27046057

Change-Id: Id7bd8cf95045b497943ea39dde49e877aa6f5c4e

8 years agoIGraphicBufferProducer: fix QUEUE_BUFFER info leak
Robert Shih [Mon, 11 Jan 2016 23:02:12 +0000 (15:02 -0800)]
IGraphicBufferProducer: fix QUEUE_BUFFER info leak

Bug: 26338109
Change-Id: I8a979469bfe1e317ebdefa43685e19f9302baea8

8 years agoIGraphicBufferConsumer: fix ATTACH_BUFFER info leak
Robert Shih [Mon, 11 Jan 2016 19:42:48 +0000 (11:42 -0800)]
IGraphicBufferConsumer: fix ATTACH_BUFFER info leak

Bug: 26338113
Change-Id: I019c4df2c6adbc944122df96968ddd11a02ebe33

8 years agoMerge "Avoiding flush on-change sensors at subscription" into mnc-dr-dev
Peng Xu [Tue, 27 Oct 2015 22:23:21 +0000 (22:23 +0000)]
Merge "Avoiding flush on-change sensors at subscription" into mnc-dr-dev

8 years agoAvoiding flush on-change sensors at subscription
Peng Xu [Mon, 26 Oct 2015 22:14:43 +0000 (15:14 -0700)]
Avoiding flush on-change sensors at subscription

Initial sensor flush at subscription is a mechanism to avoid sensors
to get stale samples before subscription happens. However, there is a
slight chance that a most recent sample will be lost during the flush
process. This is OK for continuous sensors but problematic in
on-change sensor as on-change event does not come continuously and
a lost event can cause inconsistent state in client. Flush at
subscription of on-change sensor is disabled in this CL to avoid new
important on-change event to be discarded during the initial flush
process.

Bugs: b/24647069
      b/25241873
      b/24804819

Change-Id: Ibda099c6b9f5fb6e200f13cf13a850b0026e9e7c

8 years agoDO NOT MERGE: fix build try #2 am: 778b6f4902 am: 034bc1799c -s ours am: dbc9a47831...
Nick Kralevich [Fri, 23 Oct 2015 21:22:14 +0000 (21:22 +0000)]
DO NOT MERGE: fix build try #2 am: 778b6f4902 am: 034bc1799c  -s ours am: dbc9a47831  -s ours am: a2685ebb1e am: 1d94a1d036  -s ours
am: bce101e79b

* commit 'bce101e79b5ee9715a8329db8fd760f7ba829de1':
  DO NOT MERGE: fix build try #2

8 years agoMerge changes from topic 'parcel-v2' into mnc-dr-dev
Adrian Roos [Fri, 23 Oct 2015 17:21:23 +0000 (17:21 +0000)]
Merge changes from topic 'parcel-v2' into mnc-dr-dev

* changes:
  Maintain Parcel ABI
  Revert "Revert "Track ashmem memory usage in Parcel""

8 years agoDO NOT MERGE: fix build try #2 am: 778b6f4902 am: 034bc1799c -s ours am: dbc9a47831...
Nick Kralevich [Fri, 23 Oct 2015 04:36:16 +0000 (04:36 +0000)]
DO NOT MERGE: fix build try #2 am: 778b6f4902 am: 034bc1799c  -s ours am: dbc9a47831  -s ours am: a2685ebb1e
am: 1d94a1d036  -s ours

* commit '1d94a1d036cb4bc8d9b178f56fa3bbddc81b7f10':
  DO NOT MERGE: fix build try #2

8 years agoDO NOT MERGE: fix build try #2 am: 778b6f4902 am: 034bc1799c -s ours am: dbc9a47831...
Nick Kralevich [Fri, 23 Oct 2015 04:32:47 +0000 (04:32 +0000)]
DO NOT MERGE: fix build try #2 am: 778b6f4902 am: 034bc1799c  -s ours am: dbc9a47831  -s ours
am: a2685ebb1e

* commit 'a2685ebb1ec5ed523fb4800d2593f2ae0c10ed22':
  DO NOT MERGE: fix build try #2

8 years agoDO NOT MERGE: fix build try #2 am: 778b6f4902 am: 034bc1799c -s ours
Nick Kralevich [Fri, 23 Oct 2015 04:26:03 +0000 (04:26 +0000)]
DO NOT MERGE: fix build try #2 am: 778b6f4902 am: 034bc1799c  -s ours
am: dbc9a47831  -s ours

* commit 'dbc9a478311e8728c8148a80abb103fca697891d':
  DO NOT MERGE: fix build try #2

8 years agoresolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65 am: fa632f6a...
Nick Kralevich [Fri, 23 Oct 2015 04:19:58 +0000 (04:19 +0000)]
resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65 am: fa632f6ad7 am: 9ec978732f am: 1b28b05d2e
am: 0370a03b6e

* commit '0370a03b6e74e40d5110b83fed2243bf072aee73':
  DO NOT MERGE: fix build breakage

8 years agoDO NOT MERGE: fix build try #2 am: 778b6f4902
Nick Kralevich [Fri, 23 Oct 2015 04:19:51 +0000 (04:19 +0000)]
DO NOT MERGE: fix build try #2 am: 778b6f4902
am: 034bc1799c  -s ours

* commit '034bc1799cbbc4184aa507eba181573c0a3b9b35':
  DO NOT MERGE: fix build try #2

8 years agoadd number constraint for samples per MotionEvent am: 5d17838ade am: 72c8ca4a01 am...
Flanker [Fri, 23 Oct 2015 04:19:51 +0000 (04:19 +0000)]
add number constraint for samples per MotionEvent am: 5d17838ade am: 72c8ca4a01 am: 9964d83869 am: 90dc6dc825 am: 9830f11dc6
am: a82ace99f7

* commit 'a82ace99f76ed815e16ab64eae2e9e55871a8b8f':
  add number constraint for samples per MotionEvent

8 years agoresolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65 am: fa632f6a...
Nick Kralevich [Fri, 23 Oct 2015 04:15:24 +0000 (04:15 +0000)]
resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65 am: fa632f6ad7 am: 9ec978732f
am: 1b28b05d2e

* commit '1b28b05d2edf11f49717b53cd49a9161892f0388':
  DO NOT MERGE: fix build breakage

8 years agoDO NOT MERGE: fix build try #2
Nick Kralevich [Fri, 23 Oct 2015 04:15:21 +0000 (04:15 +0000)]
DO NOT MERGE: fix build try #2
am: 778b6f4902

* commit '778b6f4902ad824d5fc62071caaa837bb47deee5':
  DO NOT MERGE: fix build try #2

8 years agoresolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65 am: fa632f6ad7
Nick Kralevich [Fri, 23 Oct 2015 02:02:42 +0000 (02:02 +0000)]
resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65 am: fa632f6ad7
am: 9ec978732f

* commit '9ec978732f8dd82e7adef3e37097eaca3fbd65f0':
  DO NOT MERGE: fix build breakage

8 years agoresolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65
Nick Kralevich [Fri, 23 Oct 2015 01:52:34 +0000 (01:52 +0000)]
resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65
am: fa632f6ad7

* commit 'fa632f6ad7be6b1f488dd3d1b825a82456db5097':
  DO NOT MERGE: fix build breakage

8 years agoresolve merge conflicts of 834ac204ce to klp-modular-dev.
Nick Kralevich [Fri, 23 Oct 2015 01:44:26 +0000 (01:44 +0000)]
resolve merge conflicts of 834ac204ce to klp-modular-dev.
am: 7f1ea80d65

* commit '7f1ea80d65996ab687ff56a884da915535cdc176':
  DO NOT MERGE: fix build breakage

8 years agoMaintain Parcel ABI
Adrian Roos [Thu, 22 Oct 2015 23:46:12 +0000 (16:46 -0700)]
Maintain Parcel ABI

Makes sure we don't change the memory layout of the Parcel class
to maintain binary compatibility with prebuilts linking against
libbinder.

Bug: 25004154
Change-Id: I656687497f08bb85cefda796aafa2341e601e30a

8 years agoRevert "Revert "Track ashmem memory usage in Parcel""
Adrian Roos [Thu, 22 Oct 2015 23:12:53 +0000 (16:12 -0700)]
Revert "Revert "Track ashmem memory usage in Parcel""

This reverts commit 6880307e8e35a6c484942443fb4ddd6173126152.

Bug: 25004154
Change-Id: I9b432d1ebc39f3bbcd7afdefc403f0fb6ced8158

8 years agoresolve merge conflicts of 834ac204ce to klp-modular-dev.
Nick Kralevich [Fri, 23 Oct 2015 00:26:19 +0000 (17:26 -0700)]
resolve merge conflicts of 834ac204ce to klp-modular-dev.

Bug: 23905002
Change-Id: Ic7262861af91a8fff27692c0f68761cb3ab12aa3

8 years agoadd number constraint for samples per MotionEvent am: 5d17838ade am: 72c8ca4a01 am...
Flanker [Thu, 22 Oct 2015 22:28:01 +0000 (22:28 +0000)]
add number constraint for samples per MotionEvent am: 5d17838ade am: 72c8ca4a01 am: 9964d83869 am: 90dc6dc825
am: 9830f11dc6

* commit '9830f11dc6b6aa4001c79147966fdb9eaa71c2f2':
  add number constraint for samples per MotionEvent

8 years agoRevert "Track ashmem memory usage in Parcel"
Ian Pedowitz [Thu, 22 Oct 2015 22:08:10 +0000 (22:08 +0000)]
Revert "Track ashmem memory usage in Parcel"

This reverts commit e2f499fb734bc30a1e1c947112caa0727349b6ed.

Bug: 25169267
Bug: 25191602
Bug: 25004154
Change-Id: I24bb0da4e8739ee5a0c251e4adac9904827144e0

8 years agoDO NOT MERGE: fix build try #2
Nick Kralevich [Thu, 22 Oct 2015 21:48:50 +0000 (14:48 -0700)]
DO NOT MERGE: fix build try #2

On klp-dev, UINT16_MAX isn't available unless __STDINT_LIMITS
is defined, which it's not for this code. This isn't relevant
for later branches due to bionic commit
e2a292d278b94fec3d078b1f1b27c1f89942c276

Don't use UINT16_MAX when we can just hardcode 65535.

Bug: 23905002
Change-Id: Ia1fd0f749cb7a4d19866075abc28ed6960424e54

8 years agoDO NOT MERGE: fix build breakage
Nick Kralevich [Thu, 22 Oct 2015 14:09:23 +0000 (07:09 -0700)]
DO NOT MERGE: fix build breakage

fix klp-dev only build breakage.

  frameworks/native/libs/input/Input.cpp: In member function 'android::status_t android::MotionEvent::readFromParcel(android::Parcel*)':
  frameworks/native/libs/input/Input.cpp:494:47: error: 'UINT16_MAX' was not declared in this scope

Bug: 23905002
Change-Id: I4b6b864ca64d39a8873d045a61e0ddaea2ab9109

8 years agoadd number constraint for samples per MotionEvent am: 5d17838ade am: 72c8ca4a01 am...
Flanker [Thu, 22 Oct 2015 02:15:13 +0000 (02:15 +0000)]
add number constraint for samples per MotionEvent am: 5d17838ade am: 72c8ca4a01 am: 9964d83869
am: 90dc6dc825

* commit '90dc6dc825ebd1f0f4c9474fad887cd7eac8e9bd':
  add number constraint for samples per MotionEvent

8 years agoadd number constraint for samples per MotionEvent am: 5d17838ade am: 72c8ca4a01
Flanker [Thu, 22 Oct 2015 02:10:12 +0000 (02:10 +0000)]
add number constraint for samples per MotionEvent am: 5d17838ade am: 72c8ca4a01
am: 9964d83869

* commit '9964d83869565cf4dda432129cfe50f6ede19338':
  add number constraint for samples per MotionEvent

8 years agoadd number constraint for samples per MotionEvent am: 5d17838ade
Flanker [Thu, 22 Oct 2015 02:04:55 +0000 (02:04 +0000)]
add number constraint for samples per MotionEvent am: 5d17838ade
am: 72c8ca4a01

* commit '72c8ca4a0191827fd3265c0820b685a6cf420be1':
  add number constraint for samples per MotionEvent

8 years agoadd number constraint for samples per MotionEvent
Flanker [Thu, 22 Oct 2015 02:02:46 +0000 (02:02 +0000)]
add number constraint for samples per MotionEvent
am: 5d17838ade

* commit '5d17838adef13062717322e79d4db0b9bb6b2395':
  add number constraint for samples per MotionEvent

8 years agoTrack ashmem memory usage in Parcel
Adrian Roos [Wed, 21 Oct 2015 02:11:23 +0000 (19:11 -0700)]
Track ashmem memory usage in Parcel

Bug: 25004154
Change-Id: Id9d5656dd0605f1b50525596b75601309f67ebdc

8 years agoadd number constraint for samples per MotionEvent
Flanker [Mon, 7 Sep 2015 07:28:58 +0000 (15:28 +0800)]
add number constraint for samples per MotionEvent

Bug:23905002

Signed-off-by: Adam Lesinski <adamlesinski@google.com>
(cherry picked from commit 552a8a5d8df32f659b8d11311a244cdc6d3b7733)

Change-Id: I9b7ea859889b7697bee4165a2746602212120543

8 years agoam 18165848: am e2c4f4fb: am c1e6fbb5: Initialize local variables to avoid data leak...
Naveen Leekha [Tue, 20 Oct 2015 17:02:33 +0000 (17:02 +0000)]
am 18165848: am e2c4f4fb: am c1e6fbb5: Initialize local variables to avoid data leak am: 7534e4e63a  -s ours am: 7b4863f606
am: 8121177b5e

* commit '8121177b5e8c406570f0eaf6593c6fd1db232ddf':
  Initialize local variables to avoid data leak

8 years agoam 18165848: am e2c4f4fb: am c1e6fbb5: Initialize local variables to avoid data leak...
Naveen Leekha [Tue, 20 Oct 2015 16:54:09 +0000 (16:54 +0000)]
am 18165848: am e2c4f4fb: am c1e6fbb5: Initialize local variables to avoid data leak am: 7534e4e63a  -s ours
am: 7b4863f606

* commit '7b4863f606bdb48b188b0235447dfaba6c8c3cf0':
  Initialize local variables to avoid data leak

8 years agoam 18165848: am e2c4f4fb: am c1e6fbb5: Initialize local variables to avoid data leak
Naveen Leekha [Tue, 20 Oct 2015 16:42:34 +0000 (16:42 +0000)]
am 18165848: am e2c4f4fb: am c1e6fbb5: Initialize local variables to avoid data leak
am: 7534e4e63a  -s ours

* commit '7534e4e63afedeb826a8d8a4b0cf3f9d40d243ea':
  Initialize local variables to avoid data leak

8 years agoMerge "Set DATA_INJECTION mode flag for sensors." into mnc-dr-dev
Aravind Akella [Wed, 14 Oct 2015 21:03:07 +0000 (21:03 +0000)]
Merge "Set DATA_INJECTION mode flag for sensors." into mnc-dr-dev

8 years agoegl: Remove window disconnect before calling driver eglDestroySurface
Jesse Hall [Wed, 14 Oct 2015 18:10:24 +0000 (11:10 -0700)]
egl: Remove window disconnect before calling driver eglDestroySurface

This was originally added for b/14445579. An in-development app was
attempting to render to a window as an EGLSurface, then tear that
down, change some window properties, and create a new EGLSurface. The
second eglCreateWindowSurface failed because the window was already
connected. This change went in, but it turned out the real problem was
that the app still (unintentionally) had the surface current. After
the app bug was fixed, nobody revisited whether this change was
actually needed.

Turns out it wasn't needed. After an EGLSurface is both destroyed
*AND* not current (basically refcount==0), we were already
disconnecting the window in ~egl_surface_t().

Apart from being unnecessary and redundant, disconnecting the window
here is wrong for two reasons:

(a) The surface may still be in use after eglDestroySurface, if it was
still current. Rendering is undefined in that case, but disconnecting
the window leads to more catastrophic results than necessary.

(b) It's being called before calling the driver's eglDestroySurface.
The driver will almost definitely have a buffer dequeued that it needs
to cancel, and by disconnecting first we turn that into an error that
they don't have a graceful way to deal with.

Bug: 24524053
Change-Id: Ib063134413d25d3526f794aafb5e333e3417ea42

8 years agoMerge "add number constraint for samples per MotionEvent" into mnc-dr-dev
Adam Lesinski [Mon, 12 Oct 2015 22:15:50 +0000 (22:15 +0000)]
Merge "add number constraint for samples per MotionEvent" into mnc-dr-dev

8 years agoadd number constraint for samples per MotionEvent
Flanker [Mon, 7 Sep 2015 07:28:58 +0000 (15:28 +0800)]
add number constraint for samples per MotionEvent

Bug:23905002
Change-Id: Ifd24802977c3dcdd1dbc5120a78aac41beae4603

Signed-off-by: Adam Lesinski <adamlesinski@google.com>
8 years agoMerge "Inputflinger: hook up key event replacement processing" into mnc-dr-dev
Puneet Kumar [Thu, 8 Oct 2015 08:16:58 +0000 (08:16 +0000)]
Merge "Inputflinger: hook up key event replacement processing" into mnc-dr-dev

8 years agoMerge "Allow defining replacement key events in keymap" into mnc-dr-dev
Puneet Kumar [Thu, 8 Oct 2015 08:16:31 +0000 (08:16 +0000)]
Merge "Allow defining replacement key events in keymap" into mnc-dr-dev

8 years agoInputResampling: Don't extrapolate for very low frame rates.
Andrew de los Reyes [Thu, 1 Oct 2015 22:57:25 +0000 (15:57 -0700)]
InputResampling: Don't extrapolate for very low frame rates.

In very low framerate situations, extrapolation is generally going to
either cause no benefit or make a mistake. We can safely turn it off
with no user-visible negative impact.

BUG=https://buganizer.corp.google.com/u/0/issues/24550942
TEST=Scrolled very slowly and saw mispredictions on Angler. With change,
saw the log message that the mispredictions were suppressed.

Change-Id: Ic9747d3ff098d7918047ada2ed1c2d21282c65b0

8 years agoInputflinger: hook up key event replacement processing
Dmitry Torokhov [Thu, 24 Sep 2015 20:13:55 +0000 (13:13 -0700)]
Inputflinger: hook up key event replacement processing

Add handling of "replacement" key events in InputReader and EventHub by
consulting device's character key map (if exists) for presence of
replacement key code for given get code and meta state combination,
before passing it to InputDispatcher.

This enables defining special keys, such as ESC, on keyboards lacking
enough physical keys, via combination of normal keys and modifiers, for
example AltR + 1 => ESC.

Bug: 24504154

Change-Id: I7e36104808bedcf724436c1fbb63d37c35cca8af

8 years agoAllow defining replacement key events in keymap
Dmitry Torokhov [Fri, 18 Sep 2015 01:04:50 +0000 (18:04 -0700)]
Allow defining replacement key events in keymap

Currently keyboard maps allow to assign character sequences to key
events and allow specifying a so-called "fallback" key events that are
re-injected into input stream if target application indicates that it
was not able to handle the original key event. Unfortunately there is no
way to perform substitution before handing the event to applicationis.

This change adds a new keymap keyword "replace" that allows users query
"replacement" actions for key (if any), with the intent that such
replacement happens early in the event handling process.

Bug: 24504154

Change-Id: I3e6a2476c856524171df00ad22ff56f2018c1278

8 years agoam 69412a51: am c4bd7211: resolved conflicts for 7534e4e6 to lmp-mr1-ub-dev
Naveen Leekha [Thu, 24 Sep 2015 23:35:41 +0000 (23:35 +0000)]
am 69412a51: am c4bd7211: resolved conflicts for 7534e4e6 to lmp-mr1-ub-dev

* commit '69412a51f58fa9450f1cb077c8d4b6410128d993':
  resolved conflicts for 7534e4e6 to lmp-mr1-ub-dev

8 years agoam c4bd7211: resolved conflicts for 7534e4e6 to lmp-mr1-ub-dev
Naveen Leekha [Thu, 24 Sep 2015 23:27:31 +0000 (23:27 +0000)]
am c4bd7211: resolved conflicts for 7534e4e6 to lmp-mr1-ub-dev

* commit 'c4bd7211373cf5b745c7d4f849f43f7a2d2b1141':
  resolved conflicts for 7534e4e6 to lmp-mr1-ub-dev

8 years agoresolved conflicts for 7534e4e6 to lmp-mr1-ub-dev
Naveen Leekha [Thu, 24 Sep 2015 22:55:21 +0000 (15:55 -0700)]
resolved conflicts for 7534e4e6 to lmp-mr1-ub-dev

Change-Id: I543df164076b44578b14d41031800bb62b81586d

8 years agoam 571e27e2: am e889592e: am 73887c08: am b414255f: Initialize local variables to...
Naveen Leekha [Thu, 24 Sep 2015 22:26:22 +0000 (22:26 +0000)]
am 571e27e2: am e889592e: am 73887c08: am b414255f: Initialize local variables to avoid data leak

* commit '571e27e20e30560985d7c3a3ba8885693695b0fc':
  Initialize local variables to avoid data leak

8 years agoam e889592e: am 73887c08: am b414255f: Initialize local variables to avoid data leak
Naveen Leekha [Thu, 24 Sep 2015 22:20:59 +0000 (22:20 +0000)]
am e889592e: am 73887c08: am b414255f: Initialize local variables to avoid data leak

* commit 'e889592e33891c9b88ff6ba655426118f8ef12ee':
  Initialize local variables to avoid data leak

8 years agoam 18165848: am e2c4f4fb: am c1e6fbb5: Initialize local variables to avoid data leak
Naveen Leekha [Thu, 24 Sep 2015 22:20:05 +0000 (22:20 +0000)]
am 18165848: am e2c4f4fb: am c1e6fbb5: Initialize local variables to avoid data leak

* commit '18165848e86feab8656bfdac3173bccf45a9a6df':
  Initialize local variables to avoid data leak

8 years agoam 73887c08: am b414255f: Initialize local variables to avoid data leak
Naveen Leekha [Thu, 24 Sep 2015 22:13:06 +0000 (22:13 +0000)]
am 73887c08: am b414255f: Initialize local variables to avoid data leak

* commit '73887c0864c9a928db6f66bd48c5aea4d31d9a8b':
  Initialize local variables to avoid data leak

8 years agoam e2c4f4fb: am c1e6fbb5: Initialize local variables to avoid data leak
Naveen Leekha [Thu, 24 Sep 2015 22:04:48 +0000 (22:04 +0000)]
am e2c4f4fb: am c1e6fbb5: Initialize local variables to avoid data leak

* commit 'e2c4f4fb8b34e36a4f2760f3812c942604cabfb6':
  Initialize local variables to avoid data leak

8 years agoam b414255f: Initialize local variables to avoid data leak
Naveen Leekha [Thu, 24 Sep 2015 22:00:33 +0000 (22:00 +0000)]
am b414255f: Initialize local variables to avoid data leak

* commit 'b414255f53b560a06e642251535b019327ba0d7b':
  Initialize local variables to avoid data leak

8 years agoam c1e6fbb5: Initialize local variables to avoid data leak
Naveen Leekha [Thu, 24 Sep 2015 22:00:13 +0000 (22:00 +0000)]
am c1e6fbb5: Initialize local variables to avoid data leak

* commit 'c1e6fbb52c3f85cc7610d1d07d12be38f70b4ed4':
  Initialize local variables to avoid data leak

8 years agoMerge "DO NOT MERGE Cancel touches as well as pointer gestures." into mnc-dr-dev
Michael Wright [Wed, 23 Sep 2015 13:18:26 +0000 (13:18 +0000)]
Merge "DO NOT MERGE Cancel touches as well as pointer gestures." into mnc-dr-dev

8 years agoMerge "DO NOT MERGE Revert "am f37143d8: Merge "Cancel touches as well as pointer...
Michael Wright [Wed, 23 Sep 2015 13:15:33 +0000 (13:15 +0000)]
Merge "DO NOT MERGE Revert "am f37143d8: Merge "Cancel touches as well as pointer gestures." into mnc-dev"" into mnc-dr-dev

8 years agoInitialize local variables to avoid data leak
Naveen Leekha [Wed, 23 Sep 2015 01:04:44 +0000 (18:04 -0700)]
Initialize local variables to avoid data leak

The uninitialized local variables pick up
whatever the memory content was there on stack.
This data gets sent to the remote process in
case of a failed transaction, which is a security
issue. Fixed.

(Partial manual merge of master change
 12ba0f57d028a9c8f4eb3afddc326b70677d1e0c. Rest
 to automerge from klp-dev)

For b/23696300

Change-Id: I704c9fab327b3545c58e8a9a96ac542eb7469c2a

8 years agoInitialize local variables to avoid data leak
Naveen Leekha [Wed, 23 Sep 2015 00:58:21 +0000 (17:58 -0700)]
Initialize local variables to avoid data leak

The uninitialized local variables pick up
whatever the memory content was there on stack.
This data gets sent to the remote process in
case of a failed transaction, which is a security
issue. Fixed.

(Manual merge of master change
 12ba0f57d028a9c8f4eb3afddc326b70677d1e0c )

For b/23696300

Change-Id: I665212d10da56f0803b5bb772d14c77e632ba2ab

8 years agoDO NOT MERGE Cancel touches as well as pointer gestures.
Michael Wright [Mon, 22 Jun 2015 15:18:21 +0000 (16:18 +0100)]
DO NOT MERGE Cancel touches as well as pointer gestures.

Bug: 24302031
Change-Id: Idbe964a1a35c190a32f845e2a19542d54652d011

8 years agoDO NOT MERGE Revert "am f37143d8: Merge "Cancel touches as well as pointer gestures...
Michael Wright [Tue, 22 Sep 2015 20:04:33 +0000 (21:04 +0100)]
DO NOT MERGE Revert "am f37143d8: Merge "Cancel touches as well as pointer gestures." into mnc-dev"

This reverts commit 9b70ab7a3cb260205e81e40ba181a86710d2eb95, reversing
changes made to 153008efb5a00ed3c18d588ce15f90d2442a9786.

Bug: 24302031

Change-Id: Ia746381b30be3b54cb646ed412b7271962c4b02a

8 years agoInstalld: Take boot status as dexopt parameter
Andreas Gampe [Mon, 21 Sep 2015 20:21:30 +0000 (13:21 -0700)]
Installd: Take boot status as dexopt parameter

Expect the boot status explicitly as a parameter so that we do not
have to rely on dev.bootcomplete, which isn't meaningfully set
when the device needs the decryption screen on boot.

Bug: 23898216
Change-Id: I9b34298caf70b1e5d40970cc0d04c469016a80a7

8 years agoMerge "Installd: Allow different behavior before bootcomplete" into mnc-dr-dev
Andreas Gampe [Wed, 16 Sep 2015 23:44:06 +0000 (23:44 +0000)]
Merge "Installd: Allow different behavior before bootcomplete" into mnc-dr-dev

8 years agoInstalld: Allow different behavior before bootcomplete
Andreas Gampe [Mon, 14 Sep 2015 23:33:11 +0000 (16:33 -0700)]
Installd: Allow different behavior before bootcomplete

Check dev.bootcomplete in dex2oat(). Use the information for
two changes.

Only switch to the background when we're post bootcomplete.
This will ensure better utilization after upgrades.

Add a second dex2oat-threads property that is used pre
bootcomplete. A separation of these phases allows using less
cores when the device is up, freeing up resources for other
purposes, e.g., avoid jank. The precedence during boot is the
boot property, or the image property if the former doesn't
exist, or the default property as a fallback.

Bug: 23898216
Bug: 24004256
Change-Id: I5063f3fc4b437cbe88c4e94584e01c1c78eccc4d

8 years agoSet DATA_INJECTION mode flag for sensors.
Aravind Akella [Thu, 10 Sep 2015 21:52:31 +0000 (14:52 -0700)]
Set DATA_INJECTION mode flag for sensors.

Bug: 24001171
Change-Id: I70133546c68fb478b2c2062f05a4164a36cd9e4b

8 years agoDump the ND offload status and address table in bugreports.
Lorenzo Colitti [Wed, 9 Sep 2015 13:59:25 +0000 (22:59 +0900)]
Dump the ND offload status and address table in bugreports.

Also, move NetworkDiagnostics between the two runs of getting the
wifi counters, so we can see the effect on the counters of
sending our probe packets.

Bug: 23661687
Change-Id: I3f81c003a35f50ac1cb8e77d0a8c73dae4fd91f3

8 years agoMerge "Map realtime to clock_monotonic." into mnc-dr-dev
Martijn Coenen [Mon, 7 Sep 2015 07:25:51 +0000 (07:25 +0000)]
Merge "Map realtime to clock_monotonic." into mnc-dr-dev

8 years agoMerge "SF: Add colorTransform to DisplayInfo" into mnc-dr-dev
Dan Stoza [Thu, 3 Sep 2015 21:55:36 +0000 (21:55 +0000)]
Merge "SF: Add colorTransform to DisplayInfo" into mnc-dr-dev

8 years agoam e35c7d65: Add body sensors app op for custom sensors
Prashant Malani [Thu, 3 Sep 2015 17:26:13 +0000 (17:26 +0000)]
am e35c7d65: Add body sensors app op for custom sensors

* commit 'e35c7d65bb3c226fe3c5fc5e3933f64f0963eaeb':
  Add body sensors app op for custom sensors

8 years agoAdd body sensors app op for custom sensors
Prashant Malani [Fri, 21 Aug 2015 00:19:05 +0000 (17:19 -0700)]
Add body sensors app op for custom sensors

If the custom sensor requires the BODY SENSOR permission, we should add
the body sensors app op for the custom sensor

Bug: 23396558
Change-Id: I132917d1bca12c76c8a9fb146e00951cba3e6d7a

8 years agoSF: Add colorTransform to DisplayInfo
Dan Stoza [Mon, 31 Aug 2015 19:06:48 +0000 (12:06 -0700)]
SF: Add colorTransform to DisplayInfo

Adds the colorTransform field, which defines a vendor-specific color
transform (e.g., wide gamut, sRGB, etc.) to the DisplayInfo class, and
populates it from the HWC interface.

Bug: 20853317
Change-Id: I153edc36a361407656f3eb5082b96c2da2ecbec7

8 years agoMap realtime to clock_monotonic.
Martijn Coenen [Wed, 15 Jul 2015 12:25:23 +0000 (14:25 +0200)]
Map realtime to clock_monotonic.

This maps a monotonic timestamp to the
corresponding real-time timestamp, which
can be used to match up the traces with
other logs that use real-time.

Also write clock_sync records first instead of at
the end, to avoid not being to write it due to the
buffer being full.

Bug: 23668823
Change-Id: I644aeea496197e194ec30f808f754e3e043d905f

8 years agoam 80402da0: Add XML for pro audio feature
Glenn Kasten [Sat, 29 Aug 2015 00:25:52 +0000 (00:25 +0000)]
am 80402da0: Add XML for pro audio feature

* commit '80402da0dec36a585a014a8ca974e28ef9034722':
  Add XML for pro audio feature

8 years agoAdd XML for pro audio feature
Glenn Kasten [Fri, 28 Aug 2015 03:09:39 +0000 (20:09 -0700)]
Add XML for pro audio feature

Bug: 23604253
Change-Id: I480cf0a46c286badc6fd95a3b42e6cb1ed056b1b

8 years agoSensorManager fixes.
Aravind Akella [Mon, 17 Aug 2015 22:22:12 +0000 (15:22 -0700)]
SensorManager fixes.

i) Use pingBinder() to check the status of sensorservice everytime an
   event_queue is created. Retry to establish the binder connection if
   SensorService has recovered from a runtime restart.
ii) LOG_ALWAYS_FATAL_IF getService(SensorService) returns NULL or malloc
    returns NULL.

Bug: 22634472
Change-Id: I4e3912839b6f4114be1a124510878774dbd576a4

8 years agoam ecc0763e: dumpstate: add logcat -b all -S
Mark Salyzyn [Tue, 11 Aug 2015 23:15:47 +0000 (23:15 +0000)]
am ecc0763e: dumpstate: add logcat -b all -S

* commit 'ecc0763e6c96c418ea4ee6c993d58d16a58407b3':
  dumpstate: add logcat -b all -S

8 years agodumpstate: add logcat -b all -S
Mark Salyzyn [Thu, 30 Jul 2015 21:57:09 +0000 (14:57 -0700)]
dumpstate: add logcat -b all -S

(cherry pick from commit e3c4df96083231b519dad919fd0ed6624100b368)

- For those that are proud to call themselves logspam police
- Every time someone declares that something is too chatty, or that
  they lost their logs because they were declared too chatty and
  their associated logs were aggresively pruned we generally
  ask them to report the logger statistics to pinpoint what software
  product that is the elephant in the room.
- Every time we want to spawn a new 'stop being so spammy' bug spawned
  off a bugreport collected for another purpose, we *wish* we had the
  logger statistics to help add gravitas to the claim that some piece
  of software is the top, or near the top, polluter.

Bug: 22351810
Change-Id: Ifae33cd21d0ae2917a3b4381502d723725b1701c

8 years agoMerge commit '62ec2dd5' into mm
Michael Wright [Fri, 7 Aug 2015 17:12:20 +0000 (18:12 +0100)]
Merge commit '62ec2dd5' into mm

Change-Id: I34801df36735545fc500486209573ed2864a0430

8 years agoDO NOT MERGE Add new media navigation keys.
Michael Wright [Thu, 6 Aug 2015 14:17:31 +0000 (15:17 +0100)]
DO NOT MERGE Add new media navigation keys.

Bug: 22059484
Change-Id: I587eb7622555194f18f403da583e3b70656a530e

8 years agoMerge "SF: Track missed frames and optionally drop them" into mnc-dr-dev
Dan Stoza [Wed, 5 Aug 2015 18:48:10 +0000 (18:48 +0000)]
Merge "SF: Track missed frames and optionally drop them" into mnc-dr-dev

8 years agoam ea2afa46: Merge "Fix parsing of extension string" into mnc-dev
Naveen Leekha [Mon, 3 Aug 2015 14:51:31 +0000 (14:51 +0000)]
am ea2afa46: Merge "Fix parsing of extension string" into mnc-dev

* commit 'ea2afa460a2c2ee6c44406c1993e8bbacac838ba':
  Fix parsing of extension string

8 years agoMerge "Fix parsing of extension string" into mnc-dev
Naveen Leekha [Mon, 3 Aug 2015 14:45:11 +0000 (14:45 +0000)]
Merge "Fix parsing of extension string" into mnc-dev

8 years agoFix parsing of extension string
Michael Lentine [Tue, 28 Jul 2015 23:30:10 +0000 (16:30 -0700)]
Fix parsing of extension string

Previously the parsing found the next space and then added the the difference
between the current position and space to the set of tokens. This improperly
generated empty strings if there were consecutive spaces or if spaces existed at
the beginning or end of strings. To fix this, the parse is modified to use
simple stringstream parsing.

Bug: 22709246

Change-Id: I9e32c07bbf984eadccdadf1dc34437fa0c46088b

8 years agoam d87defaf: SF: Allow present if sideband stream changed
Dan Stoza [Fri, 31 Jul 2015 15:44:52 +0000 (15:44 +0000)]
am d87defaf: SF: Allow present if sideband stream changed

* commit 'd87defaf486ff4e9c0066754564851cfb7be49ed':
  SF: Allow present if sideband stream changed

8 years agoBug fix in SensorManager.
Aravind Akella [Thu, 30 Jul 2015 01:03:48 +0000 (18:03 -0700)]
Bug fix in SensorManager.

If SensorService hasn't started when SensorManager instance is requested, keep retrying for a
longer duration.

Bug: 22529981
Change-Id: I3c506d962b61347085fc80b2c5832289539d6853

8 years agoSF: Allow present if sideband stream changed
Dan Stoza [Wed, 29 Jul 2015 23:15:50 +0000 (16:15 -0700)]
SF: Allow present if sideband stream changed

Allows the sideband layer to be passed all the way to HWC instead of
getting blocked by the updated PTS tracking code.

Bug: 22291067
Change-Id: Ic2f20a7528e276fff054e86ca35789c26873b348

8 years agoam a29db50c: Merge "Revert "Bug fix in SensorManager."" into mnc-dev
Narayan Kamath [Wed, 29 Jul 2015 10:07:56 +0000 (10:07 +0000)]
am a29db50c: Merge "Revert "Bug fix in SensorManager."" into mnc-dev

* commit 'a29db50c448f8d00a544b925544f3dee725f7750':
  Revert "Bug fix in SensorManager."

8 years agoMerge "Revert "Bug fix in SensorManager."" into mnc-dev
Narayan Kamath [Wed, 29 Jul 2015 09:41:23 +0000 (09:41 +0000)]
Merge "Revert "Bug fix in SensorManager."" into mnc-dev