Dan Stoza
6a25a28728
am 806334aa
: am 1998615f
: Merge "sf: Initialize EventThread before creating HWC"
...
* commit '806334aacd089d1c419ed77021a2b1bb4f7644ef':
sf: Initialize EventThread before creating HWC
2015-06-30 17:38:41 +00:00
Dan Stoza
806334aacd
am 1998615f
: Merge "sf: Initialize EventThread before creating HWC"
...
* commit '1998615f8b5becc6d2bb309a4a1686fe24c71bbc':
sf: Initialize EventThread before creating HWC
2015-06-30 17:24:40 +00:00
Dan Stoza
1998615f8b
Merge "sf: Initialize EventThread before creating HWC"
2015-06-30 17:11:08 +00:00
Daichi Hirono
b5b21d1837
am fe608c5e
: Merge "Fix directory path of codecache." into mnc-dev
...
* commit 'fe608c5e3c75714e4aa6c31e048f4a15e4951411':
Fix directory path of codecache.
2015-06-30 04:23:17 +00:00
Daichi Hirono
fe608c5e3c
Merge "Fix directory path of codecache." into mnc-dev
2015-06-30 04:01:53 +00:00
Michael Wright
fd0fdaf73b
am 3643c88f
: Merge "Send cancelation events to monitors when injection fails." into mnc-dev
...
* commit '3643c88f7b557e241d65c4857eaf49e28e7c03a2':
Send cancelation events to monitors when injection fails.
2015-06-29 17:40:25 +00:00
Michael Wright
3643c88f7b
Merge "Send cancelation events to monitors when injection fails." into mnc-dev
2015-06-29 17:10:46 +00:00
John Reck
c28e8663dd
am 9c8efe6d
: am dd749506
: Merge "Fix async_stop"
...
* commit '9c8efe6dfddc9a4800283952caacdaf9b898c43d':
Fix async_stop
2015-06-29 14:41:27 +00:00
John Reck
9c8efe6dfd
am dd749506
: Merge "Fix async_stop"
...
* commit 'dd7495068b9af549d2bb1e3c4f3d91a9a929d3f0':
Fix async_stop
2015-06-29 14:28:45 +00:00
John Reck
dd7495068b
Merge "Fix async_stop"
2015-06-29 14:17:43 +00:00
John Reck
4ba2b63bff
Fix async_stop
...
Change-Id: I68a258cf71cfcd999bbd568ab3c96255c11bec41
(cherry picked from commit 2c237ee1d5
)
2015-06-29 23:16:19 +09:00
Dan Stoza
488986f4ad
am f413de05
: Merge "libgui: Fix handling of rotated surface damage" into mnc-dev
...
* commit 'f413de05cfb9a1b84b73c8e6c306d4142130c5f7':
libgui: Fix handling of rotated surface damage
2015-06-26 20:01:09 +00:00
Dan Stoza
f413de05cf
Merge "libgui: Fix handling of rotated surface damage" into mnc-dev
2015-06-26 19:37:29 +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
Anthony Hugh
2f105552ef
am 562d470d
: am 209ea40e
: (-s ours) am 9e415d71
: DO NOT MERGE: Introduce stem keycodes for Wear
...
* commit '562d470d2ca9ac159ab20fbac32bb0d8ca7b029e':
DO NOT MERGE: Introduce stem keycodes for Wear
2015-06-26 15:09:07 +00:00
Adam Lesinski
794392999e
am 28381e45
: am d2fb7a6e
: am 8728c390
: am 2c4f5fde
: am 861c3f56
: am 9004e7f5
: am 4ff0cb44
: Verify that the native handle was created
...
* commit '28381e45de69a861d6b0d9e9cc9e8e1607a9a18f':
Verify that the native handle was created
2015-06-26 15:09:06 +00:00
Lajos Molnar
e74f1557c7
Merge "omx: add OMX_IndexParamConsumerUsageBits" into mnc-dev
2015-06-26 03:35:56 +00:00
Anthony Hugh
562d470d2c
am 209ea40e
: (-s ours) am 9e415d71
: DO NOT MERGE: Introduce stem keycodes for Wear
...
* commit '209ea40e8f3ccda405cd4e99c768b9b9b43e9dfa':
DO NOT MERGE: Introduce stem keycodes for Wear
2015-06-26 02:22:50 +00:00
Adam Lesinski
28381e45de
am d2fb7a6e
: am 8728c390
: am 2c4f5fde
: am 861c3f56
: am 9004e7f5
: am 4ff0cb44
: Verify that the native handle was created
...
* commit 'd2fb7a6e49f04182ba7b639c340414b1745137f2':
Verify that the native handle was created
2015-06-26 02:22:49 +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
Dan Stoza
db4850c01f
libgui: Fix handling of rotated surface damage
...
Incoming surface damage was not aware that the EGL implementation was
rotating buffers in response to SurfaceFlinger's transform hint. This
didn't affect all cases because the effect was to apply a 90 degree
rotation instead of a 270 degree rotation. For full-screen updates,
things more or less worked, but in other cases this caused corruption.
This fixes that by correctly undoing the effect of rotated buffers on
the incoming surface damage, and then passing that damage down
untouched to HWC.
Bug: 22068334
Change-Id: I226ecfc7a91fe2e16edd2aa6d9149f0d26b529d6
2015-06-25 16:10:18 -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
Aravind Akella
e6045537bb
am 7a1b5d5d
: Merge "Fix crash in SensorService. Ignore devices with no sensors." into mnc-dev
...
* commit '7a1b5d5dec10f05ec29e7251ada440b47a34c6aa':
Fix crash in SensorService. Ignore devices with no sensors.
2015-06-24 15:56:29 +00:00
Aravind Akella
7a1b5d5dec
Merge "Fix crash in SensorService. Ignore devices with no sensors." into mnc-dev
2015-06-24 15:34:59 +00:00
Aravind Akella
ee155cadb2
Fix crash in SensorService. Ignore devices with no sensors.
...
Change-Id: I1491740baa6348f97c336b6883b11ad2ab93cf73
2015-06-24 08:32:56 -07:00
Daichi Hirono
a2ccb9e43d
Fix directory path of codecache.
...
Previously installd removed the normal cache directory when delete_code_cache is
called. It should delete the code cache directory.
BUG=21206499
Change-Id: I5774430e389e22805fa7984b4c83420c3677ca75
2015-06-24 15:57:06 +09: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
Michael Wright
18c773307a
Merge "Add method to set action button on MotionEvent" into mnc-dev
2015-06-23 12:49:00 +00:00
Aravind Akella
357e7d7dcd
am 94188464
: Merge "More information in sensor bugreports." into mnc-dev
...
* commit '9418846431f494b53a5e9c617aed27693079c163':
More information in sensor bugreports.
2015-06-22 18:40:18 +00:00
Aravind Akella
9418846431
Merge "More information in sensor bugreports." into mnc-dev
2015-06-22 18:17:38 +00:00
David Srbecky
a34e4a398b
am 528c8ddc
: Rename --include-cfi to --generate-debug-info.
...
* commit '528c8ddc60df7b3d291b389117e4db878a20ad48':
Rename --include-cfi to --generate-debug-info.
2015-06-19 19:54:57 +00:00
David Srbecky
0a394f5428
Merge commit '3822b8b7' into mnc-dev-plus-aosp
2015-06-19 20:36:37 +01:00
David Srbecky
528c8ddc60
Rename --include-cfi to --generate-debug-info.
...
This follows a change in dex2oat.
(cherry picked from commit 741a6ff2e2
)
Bug: 21924613
Change-Id: I6b2df1668fdd09d82cfe86e6e51360b954b6c8a9
2015-06-19 02:32:41 +01:00
Andreas Gampe
3822b8b79c
Installd: Add debug.gencfi to run_dex2oat
...
Add the debug.gencfi system property that forces generation of
CFI data.
(cherry picked from commit 816243d470
)
Bug: 21924613
Change-Id: Ida66f8c1567634d05cfdbba1a982be3684e94369
2015-06-19 02:31:33 +01: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
Aravind Akella
18d6d51a00
More information in sensor bugreports.
...
i) Log last 20 activations/deactivations of sensors.
ii) Increase logging upto 50 events for accelerometer, step_counter and significant motion.
Change-Id: I3966ed0abda8b705f3d16e94a9370fa1b97baa57
2015-06-18 14:24:05 -07:00
Michael Wright
21957b9c6d
Add method to set action button on MotionEvent
...
Change-Id: I09f00fa1c2b793a88772f67fe195860ec436179d
2015-06-17 21:06:54 +01:00
Saurabh Shah
f948105810
sf: Initialize EventThread before creating HWC
...
Once HWC is created, it could use any of the provided hooks, which
could lead to a crash if the EventThread (handler) isn't initialized
prior to creating HWC.
Change-Id: I5ea35fe9bcb150fb74aae1295b798bd787ad6cee
2015-06-17 11:08:29 -07:00
Mark Salyzyn
df7f783159
am 8f37aa50
: dumpstate: modify logcat timeout to compensate for storage speed
...
* commit '8f37aa5011bf5d8c0a67126b92e3b435ffd4dca0':
dumpstate: modify logcat timeout to compensate for storage speed
2015-06-15 14:54:15 +00:00
Mark Salyzyn
2efacef121
am 3a6a953c
: am 2ab05fc5
: Merge "dumpstate: modify logcat timeout to compensate for storage speed"
...
* commit '3a6a953ccc09cf70f11000e98d8639fcf934cbc0':
dumpstate: modify logcat timeout to compensate for storage speed
2015-06-15 14:47:27 +00:00
Mark Salyzyn
3a6a953ccc
am 2ab05fc5
: Merge "dumpstate: modify logcat timeout to compensate for storage speed"
...
* commit '2ab05fc551f8ee8442b05484cce0350c1b523678':
dumpstate: modify logcat timeout to compensate for storage speed
2015-06-15 14:35:49 +00:00
Mark Salyzyn
8f37aa5011
dumpstate: modify logcat timeout to compensate for storage speed
...
(cherry pick from commit f989162bb8
)
Discover the logcat buffer size, divide by the worst storage
speed in kb/s, and multiply by ten to estimate the timeout in
ms for each named buffer. If that value is less than 20 seconds,
then select 20 seconds. Apply this to each logcat request.
Bug: 21555259
Change-Id: Id36aebff83cb06e94350e4a84fa266b66a8444fc
2015-06-15 07:28:28 -07:00
Mark Salyzyn
2ab05fc551
Merge "dumpstate: modify logcat timeout to compensate for storage speed"
2015-06-15 14:27:11 +00:00
Sharvil Nanavati
28237a7044
am 94a9875f
: Merge "Remove Bluedroid kernel dump from dumpstate." into mnc-dev
...
* commit '94a9875f7565617a000814039a4134420397a6aa':
Remove Bluedroid kernel dump from dumpstate.
2015-06-12 21:52:23 +00:00
Sharvil Nanavati
94a9875f75
Merge "Remove Bluedroid kernel dump from dumpstate." into mnc-dev
2015-06-12 21:30:03 +00:00