Commit Graph

2083 Commits

Author SHA1 Message Date
Adrian Roos
cf33d50d25 Merge changes from topic 'parcel-v2' into mnc-dr-dev
* changes:
  Maintain Parcel ABI
  Revert "Revert "Track ashmem memory usage in Parcel""
2015-10-23 17:21:23 +00:00
Nick Kralevich
18e7c64ea8 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
2015-10-23 04:19:58 +00:00
Nick Kralevich
0370a03b6e 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
2015-10-23 04:15:24 +00:00
Nick Kralevich
1b28b05d2e resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65 am: fa632f6ad7
am: 9ec978732f

* commit '9ec978732f8dd82e7adef3e37097eaca3fbd65f0':
  DO NOT MERGE: fix build breakage
2015-10-23 02:02:42 +00:00
Nick Kralevich
9ec978732f resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65
am: fa632f6ad7

* commit 'fa632f6ad7be6b1f488dd3d1b825a82456db5097':
  DO NOT MERGE: fix build breakage
2015-10-23 01:52:34 +00:00
Nick Kralevich
fa632f6ad7 resolve merge conflicts of 834ac204ce to klp-modular-dev.
am: 7f1ea80d65

* commit '7f1ea80d65996ab687ff56a884da915535cdc176':
  DO NOT MERGE: fix build breakage
2015-10-23 01:44:26 +00:00
Adrian Roos
6bb3114246 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
2015-10-22 17:48:16 -07:00
Adrian Roos
cbf3726357 Revert "Revert "Track ashmem memory usage in Parcel""
This reverts commit 6880307e8e.

Bug: 25004154
Change-Id: I9b432d1ebc39f3bbcd7afdefc403f0fb6ced8158
2015-10-22 17:47:27 -07:00
Nick Kralevich
7f1ea80d65 resolve merge conflicts of 834ac204ce to klp-modular-dev.
Bug: 23905002
Change-Id: Ic7262861af91a8fff27692c0f68761cb3ab12aa3
2015-10-22 17:26:28 -07:00
Flanker
a82ace99f7 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
2015-10-22 22:28:01 +00:00
Ian Pedowitz
6880307e8e Revert "Track ashmem memory usage in Parcel"
This reverts commit e2f499fb73.

Bug: 25169267
Bug: 25191602
Bug: 25004154
Change-Id: I24bb0da4e8739ee5a0c251e4adac9904827144e0
2015-10-22 22:09:16 +00:00
Nick Kralevich
834ac204ce 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
2015-10-22 07:09:23 -07:00
Flanker
9830f11dc6 add number constraint for samples per MotionEvent am: 5d17838ade am: 72c8ca4a01 am: 9964d83869
am: 90dc6dc825

* commit '90dc6dc825ebd1f0f4c9474fad887cd7eac8e9bd':
  add number constraint for samples per MotionEvent
2015-10-22 02:15:13 +00:00
Flanker
90dc6dc825 add number constraint for samples per MotionEvent am: 5d17838ade am: 72c8ca4a01
am: 9964d83869

* commit '9964d83869565cf4dda432129cfe50f6ede19338':
  add number constraint for samples per MotionEvent
2015-10-22 02:10:12 +00:00
Flanker
9964d83869 add number constraint for samples per MotionEvent am: 5d17838ade
am: 72c8ca4a01

* commit '72c8ca4a0191827fd3265c0820b685a6cf420be1':
  add number constraint for samples per MotionEvent
2015-10-22 02:04:55 +00:00
Flanker
72c8ca4a01 add number constraint for samples per MotionEvent
am: 5d17838ade

* commit '5d17838adef13062717322e79d4db0b9bb6b2395':
  add number constraint for samples per MotionEvent
2015-10-22 02:02:46 +00:00
Adrian Roos
e2f499fb73 Track ashmem memory usage in Parcel
Bug: 25004154
Change-Id: Id9d5656dd0605f1b50525596b75601309f67ebdc
2015-10-21 22:32:35 +00:00
Flanker
5d17838ade add number constraint for samples per MotionEvent
Bug:23905002

Signed-off-by: Adam Lesinski <adamlesinski@google.com>

(cherry picked from commit 552a8a5d8d)

Change-Id: I9b7ea859889b7697bee4165a2746602212120543
2015-10-20 12:28:15 -07:00
Adam Lesinski
16b0ae105e Merge "add number constraint for samples per MotionEvent" into mnc-dr-dev 2015-10-12 22:15:50 +00:00
Flanker
552a8a5d8d add number constraint for samples per MotionEvent
Bug:23905002
Change-Id: Ifd24802977c3dcdd1dbc5120a78aac41beae4603

Signed-off-by: Adam Lesinski <adamlesinski@google.com>
2015-10-12 11:22:37 -07:00
Dmitry Torokhov
115f93eeeb 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
2015-09-29 13:26:30 -07:00
Michael Wright
a16b98c64f 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
2015-09-22 22:05:48 +01:00
Dan Stoza
f2699fc3a8 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
2015-08-31 13:41:24 -07:00
Michael Wright
1362ec74fc Merge commit '62ec2dd5' into mm
Change-Id: I34801df36735545fc500486209573ed2864a0430
2015-08-07 18:12:20 +01:00
Michael Wright
62ec2dd563 DO NOT MERGE Add new media navigation keys.
Bug: 22059484
Change-Id: I587eb7622555194f18f403da583e3b70656a530e
2015-08-07 14:46:16 +01:00
Aravind Akella
e2806cb445 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
2015-07-30 19:05:21 +00:00
Narayan Kamath
65f1d44cd8 am a29db50c: Merge "Revert "Bug fix in SensorManager."" into mnc-dev
* commit 'a29db50c448f8d00a544b925544f3dee725f7750':
  Revert "Bug fix in SensorManager."
2015-07-29 10:07:56 +00:00
Narayan Kamath
a29db50c44 Merge "Revert "Bug fix in SensorManager."" into mnc-dev 2015-07-29 09:41:23 +00:00
Narayan Kamath
8034fc63a0 Revert "Bug fix in SensorManager."
This reverts commit 869eb2089e.

Change-Id: I4fb865e3b18bbb011fa4e4b4732336930c3a45ae
2015-07-29 09:36:05 +00:00
Aravind Akella
3a77d00927 am 2376bd68: Merge "Bug fix in SensorManager." into mnc-dev
* commit '2376bd6869f4cd835a351322d48d35567eceec4f':
  Bug fix in SensorManager.
2015-07-29 00:40:49 +00:00
Aravind Akella
2376bd6869 Merge "Bug fix in SensorManager." into mnc-dev 2015-07-29 00:21:09 +00:00
Aravind Akella
869eb2089e Bug fix in SensorManager.
If SensorService hasn't started when SensorManager instance is requested, keep retrying for a
longer duration.

Bug: 22529981
Change-Id: I4ba6b760608e34d79273aeb39568f0fa72fbaf9d
2015-07-26 11:48:06 -07:00
Lajos Molnar
a6364e257d am f892f914: Merge "omx: fix structure sizes to be the same on 32 and 64-bit builds" into mnc-dev
* commit 'f892f9141721a3805d18da2db0e1c17f1a99feb0':
  omx: fix structure sizes to be the same on 32 and 64-bit builds
2015-07-21 00:37:21 +00:00
Lajos Molnar
abaaf70129 omx: fix structure sizes to be the same on 32 and 64-bit builds
Bug: 22512621
Change-Id: I2100b8aad0a1cf110936f4a765718ba97f3d8ce7
2015-07-21 00:19:04 +00:00
Adrian Roos
687aa22c92 Show charging speed on Keyguard
Bug: 8099739
Change-Id: I2e5c21dd7ec028ce47fb03ab71e74f7fccaa9e36
2015-07-10 13:10:13 -07:00
Michael Wright
f37143d8a5 Merge "Cancel touches as well as pointer gestures." into mnc-dev 2015-07-09 21:56:21 +00:00
Aravind Akella
841a5926fc Enable sensor data injection mode through adb.
Change-Id: I415cf8ff0871fa74babaf9b879c68f210298b472
2015-06-30 14:59:58 -07:00
Lajos Molnar
84112b0999 am 3875698f: am e74f1557: Merge "omx: add OMX_IndexParamConsumerUsageBits" into mnc-dev
* commit '3875698f8d47af86e024817889e4107392d20439':
  omx: add OMX_IndexParamConsumerUsageBits
2015-06-26 15:21:01 +00:00
Lajos Molnar
3875698f8d am e74f1557: Merge "omx: add OMX_IndexParamConsumerUsageBits" into mnc-dev
* commit 'e74f1557c7030a6c988d8e4cd940c933c4237ac8':
  omx: add OMX_IndexParamConsumerUsageBits
2015-06-26 15:09:27 +00:00
Lajos Molnar
1017a1eaa7 omx: add OMX_IndexParamConsumerUsageBits
This is used by framework to query buffer consumers (e.g. video encoders)
about required usage bits.

Bug: 13222807
Change-Id: I508335c9d753c7a7224bb882f2228bd2f4144031
2015-06-25 16:58:52 -07:00
Anthony Hugh
209ea40e8f am 9e415d71: DO NOT MERGE: Introduce stem keycodes for Wear
* commit '9e415d719e4ceb7a3e93c0d60f9c3bf9ee4fc97f':
  DO NOT MERGE: Introduce stem keycodes for Wear
2015-06-25 01:27:44 +00:00
Anthony Hugh
9e415d719e DO NOT MERGE: Introduce stem keycodes for Wear
Cherry-pick from master

This change adds four new stem keycodes for Android Wear. These
keycodes are intended to represent the various hardware buttons
around the watch.  There is one primary stem key that will be used
for power/settings and three generic stem keys that will be
customizable.

BUG: 21903503
Change-Id: I762b8c0bcf3780a1756f4c1b8bbf07a039ba7781
2015-06-24 14:42:17 -07:00
Anthony Hugh
887b00dd28 Introduce stem keycodes for Wear
This change adds four new stem keycodes for Android Wear. These
keycodes are intended to represent the various hardware buttons
around the watch.  There is one primary stem key that will be used
for power/settings and three generic stem keys that will be
customizable.

BUG: 21903503
Change-Id: I60f87f027fa4d4b19933d96b4110019805b30895
2015-06-24 13:26:55 -07:00
Dan Stoza
c8c0992ace am 0638a4fa: Merge "libgui/SF: Propagate SECURE Layer flag changes" into mnc-dev
* commit '0638a4fac7250e260c0102c770090cb7eefca936':
  libgui/SF: Propagate SECURE Layer flag changes
2015-06-23 18:07:31 +00:00
Michael Wright
7d3ad69530 Merge commit '71997c1a' into manualmerge
Change-Id: Ia68fbd20ce66571dfd33764e52c3a00e2285e648
2015-06-23 19:04:31 +01:00
Dan Stoza
0638a4fac7 Merge "libgui/SF: Propagate SECURE Layer flag changes" into mnc-dev 2015-06-23 15:44:10 +00:00
Michael Wright
cc62b6c65e am 18c77330: Merge "Add method to set action button on MotionEvent" into mnc-dev
* commit '18c773307ad7ec017b1bdaed0be9323faad9986f':
  Add method to set action button on MotionEvent
2015-06-23 13:10:42 +00:00
Michael Wright
71997c1a92 Merge "Add new AINPUT_SOURCE_BLUETOOTH_STYLUS" into mnc-dev 2015-06-23 12:49:30 +00:00
Dan Stoza
2311608667 libgui/SF: Propagate SECURE Layer flag changes
This allows changes to the SECURE flag to propagate down to
Layers in SurfaceFlinger so that WindowManager can change it on the fly
in response to device policy updates.

Bug: 20934462
Change-Id: I558f6d22c6273be373f1f480365e42536af18a33
2015-06-18 15:11:20 -07:00
Michael Wright
21957b9c6d Add method to set action button on MotionEvent
Change-Id: I09f00fa1c2b793a88772f67fe195860ec436179d
2015-06-17 21:06:54 +01:00