OSDN Git Service
Chad Brubaker [Tue, 30 Jun 2015 22:59:12 +0000 (22:59 +0000)]
am
e59cb43e: Fix writeByteArray/writeInt32Array size on x64
* commit '
e59cb43edad0eff28a81b18c3c4484442ff680dd':
Fix writeByteArray/writeInt32Array size on x64
Chad Brubaker [Tue, 30 Jun 2015 21:03:55 +0000 (14:03 -0700)]
Fix writeByteArray/writeInt32Array size on x64
writeByteArray writes the size using sizeof(size_t), however it is always
read using readInt32(). On devices where sizeof(size_t) != 4 this causes
extra bytes to be written.
BUG:
22204736
Change-Id: I8d4507b6b616857ef5827f1fe9da0907d09abf0e
Dan Stoza [Tue, 30 Jun 2015 17:38:41 +0000 (17:38 +0000)]
am
806334aa: am
1998615f: Merge "sf: Initialize EventThread before creating HWC"
* commit '
806334aacd089d1c419ed77021a2b1bb4f7644ef':
sf: Initialize EventThread before creating HWC
Dan Stoza [Tue, 30 Jun 2015 17:24:40 +0000 (17:24 +0000)]
am
1998615f: Merge "sf: Initialize EventThread before creating HWC"
* commit '
1998615f8b5becc6d2bb309a4a1686fe24c71bbc':
sf: Initialize EventThread before creating HWC
Dan Stoza [Tue, 30 Jun 2015 17:11:08 +0000 (17:11 +0000)]
Merge "sf: Initialize EventThread before creating HWC"
Daichi Hirono [Tue, 30 Jun 2015 04:23:17 +0000 (04:23 +0000)]
am
fe608c5e: Merge "Fix directory path of codecache." into mnc-dev
* commit '
fe608c5e3c75714e4aa6c31e048f4a15e4951411':
Fix directory path of codecache.
Daichi Hirono [Tue, 30 Jun 2015 04:01:51 +0000 (04:01 +0000)]
Merge "Fix directory path of codecache." into mnc-dev
Michael Wright [Mon, 29 Jun 2015 17:40:25 +0000 (17:40 +0000)]
am
3643c88f: Merge "Send cancelation events to monitors when injection fails." into mnc-dev
* commit '
3643c88f7b557e241d65c4857eaf49e28e7c03a2':
Send cancelation events to monitors when injection fails.
Michael Wright [Mon, 29 Jun 2015 17:10:45 +0000 (17:10 +0000)]
Merge "Send cancelation events to monitors when injection fails." into mnc-dev
John Reck [Mon, 29 Jun 2015 14:41:27 +0000 (14:41 +0000)]
am
9c8efe6d: am
dd749506: Merge "Fix async_stop"
* commit '
9c8efe6dfddc9a4800283952caacdaf9b898c43d':
Fix async_stop
John Reck [Mon, 29 Jun 2015 14:28:45 +0000 (14:28 +0000)]
am
dd749506: Merge "Fix async_stop"
* commit '
dd7495068b9af549d2bb1e3c4f3d91a9a929d3f0':
Fix async_stop
John Reck [Mon, 29 Jun 2015 14:17:43 +0000 (14:17 +0000)]
Merge "Fix async_stop"
John Reck [Fri, 15 May 2015 17:00:34 +0000 (10:00 -0700)]
Fix async_stop
Change-Id: I68a258cf71cfcd999bbd568ab3c96255c11bec41
(cherry picked from commit
2c237ee1d5961b9d11618e0c5a97b3bb7fb694b2)
Dan Stoza [Fri, 26 Jun 2015 20:01:09 +0000 (20:01 +0000)]
am
f413de05: Merge "libgui: Fix handling of rotated surface damage" into mnc-dev
* commit '
f413de05cfb9a1b84b73c8e6c306d4142130c5f7':
libgui: Fix handling of rotated surface damage
Dan Stoza [Fri, 26 Jun 2015 19:37:23 +0000 (19:37 +0000)]
Merge "libgui: Fix handling of rotated surface damage" into mnc-dev
Lajos Molnar [Fri, 26 Jun 2015 15:09:27 +0000 (15:09 +0000)]
am
e74f1557: Merge "omx: add OMX_IndexParamConsumerUsageBits" into mnc-dev
* commit '
e74f1557c7030a6c988d8e4cd940c933c4237ac8':
omx: add OMX_IndexParamConsumerUsageBits
Anthony Hugh [Fri, 26 Jun 2015 15:09:07 +0000 (15:09 +0000)]
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
Adam Lesinski [Fri, 26 Jun 2015 15:09:06 +0000 (15:09 +0000)]
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
Lajos Molnar [Fri, 26 Jun 2015 03:35:55 +0000 (03:35 +0000)]
Merge "omx: add OMX_IndexParamConsumerUsageBits" into mnc-dev
Anthony Hugh [Fri, 26 Jun 2015 02:22:50 +0000 (02:22 +0000)]
am
209ea40e: (-s ours) am
9e415d71: DO NOT MERGE: Introduce stem keycodes for Wear
* commit '
209ea40e8f3ccda405cd4e99c768b9b9b43e9dfa':
DO NOT MERGE: Introduce stem keycodes for Wear
Adam Lesinski [Fri, 26 Jun 2015 02:22:49 +0000 (02:22 +0000)]
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
Lajos Molnar [Thu, 25 Jun 2015 23:57:17 +0000 (16:57 -0700)]
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
Dan Stoza [Thu, 25 Jun 2015 23:10:18 +0000 (16:10 -0700)]
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
Anthony Hugh [Thu, 25 Jun 2015 01:27:44 +0000 (01:27 +0000)]
am
9e415d71: DO NOT MERGE: Introduce stem keycodes for Wear
* commit '
9e415d719e4ceb7a3e93c0d60f9c3bf9ee4fc97f':
DO NOT MERGE: Introduce stem keycodes for Wear
Anthony Hugh [Tue, 23 Jun 2015 17:49:05 +0000 (10:49 -0700)]
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
Aravind Akella [Wed, 24 Jun 2015 15:56:29 +0000 (15:56 +0000)]
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.
Aravind Akella [Wed, 24 Jun 2015 15:34:59 +0000 (15:34 +0000)]
Merge "Fix crash in SensorService. Ignore devices with no sensors." into mnc-dev
Aravind Akella [Wed, 24 Jun 2015 15:31:32 +0000 (08:31 -0700)]
Fix crash in SensorService. Ignore devices with no sensors.
Change-Id: I1491740baa6348f97c336b6883b11ad2ab93cf73
Daichi Hirono [Wed, 24 Jun 2015 06:57:06 +0000 (15:57 +0900)]
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
Dan Stoza [Tue, 23 Jun 2015 18:07:31 +0000 (18:07 +0000)]
am
0638a4fa: Merge "libgui/SF: Propagate SECURE Layer flag changes" into mnc-dev
* commit '
0638a4fac7250e260c0102c770090cb7eefca936':
libgui/SF: Propagate SECURE Layer flag changes
Michael Wright [Tue, 23 Jun 2015 18:04:31 +0000 (19:04 +0100)]
Merge commit '
71997c1a' into manualmerge
Change-Id: Ia68fbd20ce66571dfd33764e52c3a00e2285e648
Dan Stoza [Tue, 23 Jun 2015 15:44:08 +0000 (15:44 +0000)]
Merge "libgui/SF: Propagate SECURE Layer flag changes" into mnc-dev
Michael Wright [Tue, 23 Jun 2015 13:10:42 +0000 (13:10 +0000)]
am
18c77330: Merge "Add method to set action button on MotionEvent" into mnc-dev
* commit '
18c773307ad7ec017b1bdaed0be9323faad9986f':
Add method to set action button on MotionEvent
Michael Wright [Tue, 23 Jun 2015 12:49:28 +0000 (12:49 +0000)]
Merge "Add new AINPUT_SOURCE_BLUETOOTH_STYLUS" into mnc-dev
Michael Wright [Tue, 23 Jun 2015 12:48:52 +0000 (12:48 +0000)]
Merge "Add method to set action button on MotionEvent" into mnc-dev
Aravind Akella [Mon, 22 Jun 2015 18:40:18 +0000 (18:40 +0000)]
am
94188464: Merge "More information in sensor bugreports." into mnc-dev
* commit '
9418846431f494b53a5e9c617aed27693079c163':
More information in sensor bugreports.
Aravind Akella [Mon, 22 Jun 2015 18:17:38 +0000 (18:17 +0000)]
Merge "More information in sensor bugreports." into mnc-dev
David Srbecky [Fri, 19 Jun 2015 19:54:57 +0000 (19:54 +0000)]
am
528c8ddc: Rename --include-cfi to --generate-debug-info.
* commit '
528c8ddc60df7b3d291b389117e4db878a20ad48':
Rename --include-cfi to --generate-debug-info.
David Srbecky [Fri, 19 Jun 2015 19:36:37 +0000 (20:36 +0100)]
Merge commit '
3822b8b7' into mnc-dev-plus-aosp
David Srbecky [Thu, 28 May 2015 15:55:50 +0000 (16:55 +0100)]
Rename --include-cfi to --generate-debug-info.
This follows a change in dex2oat.
(cherry picked from commit
741a6ff2e264b96edbca3ac95e720b21c8e39382)
Bug:
21924613
Change-Id: I6b2df1668fdd09d82cfe86e6e51360b954b6c8a9
Andreas Gampe [Fri, 24 Apr 2015 21:30:04 +0000 (14:30 -0700)]
Installd: Add debug.gencfi to run_dex2oat
Add the debug.gencfi system property that forces generation of
CFI data.
(cherry picked from commit
816243d470bade03c264e67e39590f6852581898)
Bug:
21924613
Change-Id: Ida66f8c1567634d05cfdbba1a982be3684e94369
Dan Stoza [Thu, 18 Jun 2015 21:58:39 +0000 (14:58 -0700)]
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
Aravind Akella [Thu, 18 Jun 2015 21:18:28 +0000 (14:18 -0700)]
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
Michael Wright [Wed, 17 Jun 2015 20:06:54 +0000 (21:06 +0100)]
Add method to set action button on MotionEvent
Change-Id: I09f00fa1c2b793a88772f67fe195860ec436179d
Saurabh Shah [Tue, 16 Jun 2015 00:55:51 +0000 (17:55 -0700)]
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
Mark Salyzyn [Mon, 15 Jun 2015 14:54:15 +0000 (14:54 +0000)]
am
8f37aa50: dumpstate: modify logcat timeout to compensate for storage speed
* commit '
8f37aa5011bf5d8c0a67126b92e3b435ffd4dca0':
dumpstate: modify logcat timeout to compensate for storage speed
Mark Salyzyn [Mon, 15 Jun 2015 14:47:27 +0000 (14:47 +0000)]
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
Mark Salyzyn [Mon, 15 Jun 2015 14:35:49 +0000 (14:35 +0000)]
am
2ab05fc5: Merge "dumpstate: modify logcat timeout to compensate for storage speed"
* commit '
2ab05fc551f8ee8442b05484cce0350c1b523678':
dumpstate: modify logcat timeout to compensate for storage speed
Mark Salyzyn [Fri, 12 Jun 2015 19:28:24 +0000 (12:28 -0700)]
dumpstate: modify logcat timeout to compensate for storage speed
(cherry pick from commit
f989162bb89dff6387f2021101306a1be6d875f7)
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
Mark Salyzyn [Mon, 15 Jun 2015 14:27:10 +0000 (14:27 +0000)]
Merge "dumpstate: modify logcat timeout to compensate for storage speed"
Sharvil Nanavati [Fri, 12 Jun 2015 21:52:23 +0000 (21:52 +0000)]
am
94a9875f: Merge "Remove Bluedroid kernel dump from dumpstate." into mnc-dev
* commit '
94a9875f7565617a000814039a4134420397a6aa':
Remove Bluedroid kernel dump from dumpstate.
Sharvil Nanavati [Fri, 12 Jun 2015 21:30:02 +0000 (21:30 +0000)]
Merge "Remove Bluedroid kernel dump from dumpstate." into mnc-dev
Mark Salyzyn [Fri, 12 Jun 2015 19:28:24 +0000 (12:28 -0700)]
dumpstate: modify logcat timeout to compensate for storage speed
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
Dan Stoza [Fri, 12 Jun 2015 20:05:27 +0000 (20:05 +0000)]
am
0501cdbc: am
2b5b55e7: Merge "sf: Fix incorrect state reporting in dumpsys"
* commit '
0501cdbc0431f50eb22cc761dbdcbc3975005a70':
sf: Fix incorrect state reporting in dumpsys
Sharvil Nanavati [Fri, 12 Jun 2015 18:35:24 +0000 (11:35 -0700)]
Remove Bluedroid kernel dump from dumpstate.
Bluedroid doesn't have much of a kernel component and no devices
expose a bluedroid node in debugfs.
Change-Id: I5600e88c543a109257d95591704a8f2a7261dfdc
Manoj Kumar AVM [Fri, 12 Jun 2015 17:31:23 +0000 (17:31 +0000)]
am
e04e4edc: sf: Fix incorrect state reporting in dumpsys
* commit '
e04e4edcd1a852058775caa34cf73e2c20dc1066':
sf: Fix incorrect state reporting in dumpsys
Dan Stoza [Fri, 12 Jun 2015 17:00:44 +0000 (17:00 +0000)]
am
2b5b55e7: Merge "sf: Fix incorrect state reporting in dumpsys"
* commit '
2b5b55e73c79658b9a0ae3fdf347f6dbe65e3c68':
sf: Fix incorrect state reporting in dumpsys
Manoj Kumar AVM [Thu, 11 Jun 2015 21:18:14 +0000 (14:18 -0700)]
sf: Fix incorrect state reporting in dumpsys
Dumpsys utility accesses layer compositionType variable
with out proper protection. These variables are modified
during hwc_prepare call. Existing HAL lock protection is not
sufficient to address this issue. Failure to do this will
result in incorrect state reporting in dumpsys.
A new displayLock mutex in HWComposer will be used in both
dumpsys and draw calls to ensure correct state is accessed.
Change-Id: I8a57de59525adc0e089b3bed95c067c01e42b666
(cherry picked from commit
e54506b81a3b81683056ad48294e37d6b4b4e36b)
Dan Stoza [Fri, 12 Jun 2015 16:47:21 +0000 (16:47 +0000)]
Merge "sf: Fix incorrect state reporting in dumpsys"
Michael Wright [Fri, 12 Jun 2015 14:25:08 +0000 (15:25 +0100)]
Add new AINPUT_SOURCE_BLUETOOTH_STYLUS
Bug:
21531826
Change-Id: I3792860ad3f6579ceb50ccaa212f8fbd471a9b6b
Michael Wright [Fri, 12 Jun 2015 12:25:11 +0000 (13:25 +0100)]
Send cancelation events to monitors when injection fails.
Bug:
20649729
Change-Id: I46cd14ac1f040d404c0b1581b38fa07a944e5fb9
Manoj Kumar AVM [Thu, 11 Jun 2015 21:18:14 +0000 (14:18 -0700)]
sf: Fix incorrect state reporting in dumpsys
Dumpsys utility accesses layer compositionType variable
with out proper protection. These variables are modified
during hwc_prepare call. Existing HAL lock protection is not
sufficient to address this issue. Failure to do this will
result in incorrect state reporting in dumpsys.
A new displayLock mutex in HWComposer will be used in both
dumpsys and draw calls to ensure correct state is accessed.
Change-Id: I8a57de59525adc0e089b3bed95c067c01e42b666
Dan Stoza [Thu, 11 Jun 2015 19:54:23 +0000 (19:54 +0000)]
am
25a83393: am
85e271d0: Merge "sf: Add a NULL check in getDisplayConfigs"
* commit '
25a83393e6a49b136eb7b58eb2f0b3f00b915f2e':
sf: Add a NULL check in getDisplayConfigs
Dan Stoza [Thu, 11 Jun 2015 19:40:31 +0000 (19:40 +0000)]
am
85e271d0: Merge "sf: Add a NULL check in getDisplayConfigs"
* commit '
85e271d051770fdd5bb1bb017255f735cbd45459':
sf: Add a NULL check in getDisplayConfigs
Dan Stoza [Thu, 11 Jun 2015 19:31:43 +0000 (19:31 +0000)]
Merge "sf: Add a NULL check in getDisplayConfigs"
Tatenda Chipeperekwa [Wed, 29 Oct 2014 23:47:19 +0000 (16:47 -0700)]
sf: Add a NULL check in getDisplayConfigs
Validate the display binder by adding a NULL check in getDisplayConfigs.
This will prevent a false match if the caller queries the display
configs for an inactive display (whose binder is NULL by default).
Without this change we might end up attempting to index the display
config array, which is unpopulated for inactive displays, and this will
result in a crash. (See getDisplayInfo in SurfaceComposerClient.cpp for
an example of this scenario)
Change-Id: Ib32a7dc8378d3438df0dba1ecd608bbcfc837717
Tatenda Chipeperekwa [Thu, 11 Jun 2015 18:57:28 +0000 (18:57 +0000)]
am
23e16bb5: sf: Add a NULL check in getDisplayConfigs
* commit '
23e16bb5dae277cd20a739ca56553ae931c43ccf':
sf: Add a NULL check in getDisplayConfigs
Dan Stoza [Thu, 11 Jun 2015 18:01:37 +0000 (18:01 +0000)]
am
35710ab0: am
ffe3e96a: Merge "GLConsumer: Fix crop math"
* commit '
35710ab014b6ff4a914f00509ecb34737d37fb47':
GLConsumer: Fix crop math
Dan Stoza [Thu, 11 Jun 2015 17:47:58 +0000 (17:47 +0000)]
am
ffe3e96a: Merge "GLConsumer: Fix crop math"
* commit '
ffe3e96afe99e94904ca0c8f458a3eb708d78066':
GLConsumer: Fix crop math
Tatenda Chipeperekwa [Wed, 29 Oct 2014 23:47:19 +0000 (16:47 -0700)]
sf: Add a NULL check in getDisplayConfigs
Validate the display binder by adding a NULL check in getDisplayConfigs.
This will prevent a false match if the caller queries the display
configs for an inactive display (whose binder is NULL by default).
Without this change we might end up attempting to index the display
config array, which is unpopulated for inactive displays, and this will
result in a crash. (See getDisplayInfo in SurfaceComposerClient.cpp for
an example of this scenario)
Change-Id: I1a12f43b7c375b9c01998dadd5b658275c733fb2
(cherry picked from commit
ac71c26e9180d9d181be5ec9e45da72d39144a8b)
Dan Stoza [Thu, 11 Jun 2015 17:34:15 +0000 (17:34 +0000)]
Merge "GLConsumer: Fix crop math"
Dan Stoza [Thu, 11 Jun 2015 17:32:56 +0000 (17:32 +0000)]
am
6cd8771c: Merge "GLConsumer: Fix crop math" into mnc-dev
* commit '
6cd8771c9cb9512e094bc2944bb7dd38665c1838':
GLConsumer: Fix crop math
Dan Stoza [Tue, 9 Jun 2015 22:05:23 +0000 (15:05 -0700)]
GLConsumer: Fix crop math
When we have excess pixels that need to be removed from (for example)
the left and right sides, we currently do something like:
left += excess / 2;
right -= excess / 2;
If excess is odd, however, this removes 1 too few pixels since the odd
pixel gets rounded down twice. This changes the math to effectively:
left += excess / 2;
right -= (excess - excess / 2);
Which removes the correct total number of pixels.
Bug:
19611086
Change-Id: I8d1ad9fe7ba67c149794c148663d12acbccccef0
(cherry picked from commit
ec4cb387502d5bd09e49b55605cf679fe3a0207a)
Dan Stoza [Thu, 11 Jun 2015 17:12:49 +0000 (17:12 +0000)]
Merge "GLConsumer: Fix crop math" into mnc-dev
Chris Craik [Thu, 11 Jun 2015 02:08:20 +0000 (02:08 +0000)]
am
8a4222a6: Merge "Add tracing header" into mnc-dev
* commit '
8a4222a647bd17c991959eca17a50ba911c3ab6b':
Add tracing header
Aravind Akella [Thu, 11 Jun 2015 02:08:19 +0000 (02:08 +0000)]
am
52720f45: Merge "Use LOCATION_HARDWARE permission for data injection." into mnc-dev
* commit '
52720f45098e9aed57c906e64a13e4a4a2173ce8':
Use LOCATION_HARDWARE permission for data injection.
Chris Craik [Wed, 10 Jun 2015 23:48:13 +0000 (23:48 +0000)]
Merge "Add tracing header" into mnc-dev
Aravind Akella [Wed, 10 Jun 2015 22:56:26 +0000 (22:56 +0000)]
Merge "Use LOCATION_HARDWARE permission for data injection." into mnc-dev
Aravind Akella [Wed, 10 Jun 2015 22:15:57 +0000 (15:15 -0700)]
Use LOCATION_HARDWARE permission for data injection.
Change-Id: Ie81cb0d5f537d5431f2127891cca1d39c969ee7b
Dan Stoza [Wed, 10 Jun 2015 20:36:51 +0000 (20:36 +0000)]
am
430f5f5a: am
127cf2ef: Merge "SF: Swap w/h when capturing rotated screenshots"
* commit '
430f5f5a6203cf6a4d688bc59a7082eb517533e3':
SF: Swap w/h when capturing rotated screenshots
Chris Craik [Wed, 10 Jun 2015 00:28:05 +0000 (17:28 -0700)]
Add tracing header
bug:
21195272
Change-Id: I520de9fee7fc40d0570d6bef450d756ce42a1462
Dan Stoza [Wed, 10 Jun 2015 18:21:55 +0000 (18:21 +0000)]
am
127cf2ef: Merge "SF: Swap w/h when capturing rotated screenshots"
* commit '
127cf2eff638a98c5318ba8b3edaf3ca651c4090':
SF: Swap w/h when capturing rotated screenshots
Dan Stoza [Wed, 10 Jun 2015 18:10:07 +0000 (18:10 +0000)]
Merge "SF: Swap w/h when capturing rotated screenshots"
Dan Stoza [Wed, 10 Jun 2015 17:52:50 +0000 (17:52 +0000)]
am
d177e044: Merge "SF: Swap w/h when capturing rotated screenshots" into mnc-dev
* commit '
d177e044d129bbecc3900a7fcd442b354de768df':
SF: Swap w/h when capturing rotated screenshots
Christopher Tate [Wed, 10 Jun 2015 17:52:50 +0000 (17:52 +0000)]
am
2560442a: Merge "Prevent integer overflow when calculating buffer resizes" into mnc-dev
* commit '
2560442a1ed7e21b9d941218d2e9e203626fa731':
Prevent integer overflow when calculating buffer resizes
Dan Stoza [Tue, 9 Jun 2015 23:44:40 +0000 (16:44 -0700)]
SF: Swap w/h when capturing rotated screenshots
Swaps width and height when capturing a screenshot that is rotated by
90 or 270 degrees.
Bug:
8433742
Change-Id: Ibf0b604f541e3cc271e56fe0ad04dc366beb5d79
(cherry picked from commit
3502416204d9dbd905012ee586d8bd145323809f)
Michael Wright [Wed, 10 Jun 2015 17:32:41 +0000 (17:32 +0000)]
am
043bd36b: Merge "Only log dropped input when disabled for the first event." into mnc-dev
* commit '
043bd36b0d50efa81d010c64009317af160d5fec':
Only log dropped input when disabled for the first event.
Dan Stoza [Wed, 10 Jun 2015 17:28:32 +0000 (17:28 +0000)]
Merge "SF: Swap w/h when capturing rotated screenshots" into mnc-dev
Christopher Tate [Wed, 10 Jun 2015 17:26:43 +0000 (17:26 +0000)]
Merge "Prevent integer overflow when calculating buffer resizes" into mnc-dev
Dan Stoza [Tue, 9 Jun 2015 22:05:23 +0000 (15:05 -0700)]
GLConsumer: Fix crop math
When we have excess pixels that need to be removed from (for example)
the left and right sides, we currently do something like:
left += excess / 2;
right -= excess / 2;
If excess is odd, however, this removes 1 too few pixels since the odd
pixel gets rounded down twice. This changes the math to effectively:
left += excess / 2;
right -= (excess - excess / 2);
Which removes the correct total number of pixels.
Bug:
19611086
Change-Id: I8d1ad9fe7ba67c149794c148663d12acbccccef0
Michael Wright [Wed, 10 Jun 2015 17:08:01 +0000 (17:08 +0000)]
Merge "Only log dropped input when disabled for the first event." into mnc-dev
Michael Wright [Wed, 10 Jun 2015 14:26:13 +0000 (15:26 +0100)]
Only log dropped input when disabled for the first event.
Bug:
19851495
Change-Id: I8cb8076723c1ca1732c3bc37f283d8eb48b7bee0
Erik Kline [Tue, 9 Jun 2015 23:47:36 +0000 (23:47 +0000)]
am
47a7dc81: Merge "Incorporate network diagnostics during a bugreport" into mnc-dev
* commit '
47a7dc81d0fedc1e85091f0e8a868768d0e8cadd':
Incorporate network diagnostics during a bugreport
Dan Stoza [Tue, 9 Jun 2015 23:44:40 +0000 (16:44 -0700)]
SF: Swap w/h when capturing rotated screenshots
Swaps width and height when capturing a screenshot that is rotated by
90 or 270 degrees.
Bug:
8433742
Change-Id: Ibf0b604f541e3cc271e56fe0ad04dc366beb5d79
Erik Kline [Tue, 9 Jun 2015 23:24:53 +0000 (23:24 +0000)]
Merge "Incorporate network diagnostics during a bugreport" into mnc-dev
Dan Stoza [Tue, 9 Jun 2015 20:56:34 +0000 (20:56 +0000)]
am
558f55c7: am
5ab3ba1e: Merge "SF: Don\'t crop surface damage against viewport"
* commit '
558f55c79874990cb629a02fd015eec445a20e44':
SF: Don't crop surface damage against viewport
Dan Stoza [Tue, 9 Jun 2015 20:40:48 +0000 (20:40 +0000)]
am
5ab3ba1e: Merge "SF: Don\'t crop surface damage against viewport"
* commit '
5ab3ba1e43e609c7a77cc780c888f666d153a4c9':
SF: Don't crop surface damage against viewport
Dan Stoza [Tue, 9 Jun 2015 20:28:59 +0000 (20:28 +0000)]
Merge "SF: Don't crop surface damage against viewport"
Dan Stoza [Fri, 5 Jun 2015 02:40:03 +0000 (19:40 -0700)]
SF: Don't crop surface damage against viewport
Apply the display transform to surface damage, but don't intersect it
with the viewport.
Bug:
21486007
Change-Id: I94e697cea52096a960385d5f3b89609fdcf30a02
(cherry picked from commit
17833a1b0d70cd5cea342cadea9fdbbf16748bc6)
Dan Stoza [Tue, 9 Jun 2015 20:13:53 +0000 (20:13 +0000)]
am
837b9fb8: am
816c9e0e: Merge "libgui/SurfaceFlinger: Add getConsumerName"
* commit '
837b9fb87b0a8ea8a4ca680952b86e4d759723d0':
libgui/SurfaceFlinger: Add getConsumerName