Commit Graph

53047 Commits

Author SHA1 Message Date
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
9c9cc382e0 am df7f7831: am 8f37aa50: dumpstate: modify logcat timeout to compensate for storage speed
* commit 'df7f783159300ab3843699d6296b60f04885d7c2':
  dumpstate: modify logcat timeout to compensate for storage speed
2015-06-15 15:07:15 +00: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
3b13ff948b am 2efacef1: am 3a6a953c: am 2ab05fc5: Merge "dumpstate: modify logcat timeout to compensate for storage speed"
* commit '2efacef121a680f2f180cab63601d96879345d06':
  dumpstate: modify logcat timeout to compensate for storage speed
2015-06-15 14:53:44 +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
d68e5b395d am 28237a70: am 94a9875f: Merge "Remove Bluedroid kernel dump from dumpstate." into mnc-dev
* commit '28237a7044269c215e213a82b920b72bb5d15e86':
  Remove Bluedroid kernel dump from dumpstate.
2015-06-12 22:05:35 +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
Mark Salyzyn
f989162bb8 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
2015-06-12 13:19:04 -07:00
Dan Stoza
5075ba76d0 am 918537dc: am 0501cdbc: am 2b5b55e7: Merge "sf: Fix incorrect state reporting in dumpsys"
* commit '918537dc764dc2a8e266fc5f89fd072d34656688':
  sf: Fix incorrect state reporting in dumpsys
2015-06-12 20:12:42 +00:00
Dan Stoza
918537dc76 am 0501cdbc: am 2b5b55e7: Merge "sf: Fix incorrect state reporting in dumpsys"
* commit '0501cdbc0431f50eb22cc761dbdcbc3975005a70':
  sf: Fix incorrect state reporting in dumpsys
2015-06-12 20:05:27 +00:00
Sharvil Nanavati
3ba7e729a7 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
2015-06-12 11:35:24 -07:00
Manoj Kumar AVM
f1bc814276 am 407f48c8: am e04e4edc: sf: Fix incorrect state reporting in dumpsys
* commit '407f48c825351e7b5cbf455a85aff2154c696fdd':
  sf: Fix incorrect state reporting in dumpsys
2015-06-12 17:44:06 +00:00
Manoj Kumar AVM
407f48c825 am e04e4edc: sf: Fix incorrect state reporting in dumpsys
* commit 'e04e4edcd1a852058775caa34cf73e2c20dc1066':
  sf: Fix incorrect state reporting in dumpsys
2015-06-12 17:31:23 +00:00
Dan Stoza
0501cdbc04 am 2b5b55e7: Merge "sf: Fix incorrect state reporting in dumpsys"
* commit '2b5b55e73c79658b9a0ae3fdf347f6dbe65e3c68':
  sf: Fix incorrect state reporting in dumpsys
2015-06-12 17:00:44 +00:00
Manoj Kumar AVM
e04e4edcd1 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 e54506b81a)
2015-06-12 09:48:07 -07:00
Dan Stoza
2b5b55e73c Merge "sf: Fix incorrect state reporting in dumpsys" 2015-06-12 16:47:21 +00:00
Michael Wright
2f78b68cf1 Add new AINPUT_SOURCE_BLUETOOTH_STYLUS
Bug: 21531826
Change-Id: I3792860ad3f6579ceb50ccaa212f8fbd471a9b6b
2015-06-12 15:25:08 +01:00
Michael Wright
fa13dcf39f Send cancelation events to monitors when injection fails.
Bug: 20649729
Change-Id: I46cd14ac1f040d404c0b1581b38fa07a944e5fb9
2015-06-12 13:25:11 +01:00
Manoj Kumar AVM
e54506b81a 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
2015-06-11 18:21:18 -04:00
Dan Stoza
d8fc6824ef am e8bdcc67: am 25a83393: am 85e271d0: Merge "sf: Add a NULL check in getDisplayConfigs"
* commit 'e8bdcc67c5b560212c9af3cfb6d922fcaecada91':
  sf: Add a NULL check in getDisplayConfigs
2015-06-11 20:25:27 +00:00
Dan Stoza
e8bdcc67c5 am 25a83393: am 85e271d0: Merge "sf: Add a NULL check in getDisplayConfigs"
* commit '25a83393e6a49b136eb7b58eb2f0b3f00b915f2e':
  sf: Add a NULL check in getDisplayConfigs
2015-06-11 19:54:23 +00:00
Dan Stoza
25a83393e6 am 85e271d0: Merge "sf: Add a NULL check in getDisplayConfigs"
* commit '85e271d051770fdd5bb1bb017255f735cbd45459':
  sf: Add a NULL check in getDisplayConfigs
2015-06-11 19:40:31 +00:00
Dan Stoza
85e271d051 Merge "sf: Add a NULL check in getDisplayConfigs" 2015-06-11 19:31:44 +00:00
Tatenda Chipeperekwa
40da48bfdf 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
2015-06-11 12:28:41 -07:00
Tatenda Chipeperekwa
0abd853a68 am c1d4662f: am 23e16bb5: sf: Add a NULL check in getDisplayConfigs
* commit 'c1d4662f0e596021e0d8360cd1c5d213c3c8c4ba':
  sf: Add a NULL check in getDisplayConfigs
2015-06-11 19:09:30 +00:00
Tatenda Chipeperekwa
c1d4662f0e am 23e16bb5: sf: Add a NULL check in getDisplayConfigs
* commit '23e16bb5dae277cd20a739ca56553ae931c43ccf':
  sf: Add a NULL check in getDisplayConfigs
2015-06-11 18:57:28 +00:00
Dan Stoza
586ffb0a2e am 7ba43681: am 35710ab0: am ffe3e96a: Merge "GLConsumer: Fix crop math"
* commit '7ba4368100c10e0c15f5f92c097fcf7fc32eed2a':
  GLConsumer: Fix crop math
2015-06-11 18:18:39 +00:00
Dan Stoza
7ba4368100 am 35710ab0: am ffe3e96a: Merge "GLConsumer: Fix crop math"
* commit '35710ab014b6ff4a914f00509ecb34737d37fb47':
  GLConsumer: Fix crop math
2015-06-11 18:01:37 +00:00
Dan Stoza
35710ab014 am ffe3e96a: Merge "GLConsumer: Fix crop math"
* commit 'ffe3e96afe99e94904ca0c8f458a3eb708d78066':
  GLConsumer: Fix crop math
2015-06-11 17:47:58 +00:00
Dan Stoza
35c98a4cec am 765511d8: am 6cd8771c: Merge "GLConsumer: Fix crop math" into mnc-dev
* commit '765511d8a19cac4035366e7bfbc719153e9f9e6b':
  GLConsumer: Fix crop math
2015-06-11 17:47:31 +00:00
Tatenda Chipeperekwa
23e16bb5da 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)
2015-06-11 10:40:21 -07:00
Dan Stoza
ffe3e96afe Merge "GLConsumer: Fix crop math" 2015-06-11 17:34:15 +00:00
Dan Stoza
765511d8a1 am 6cd8771c: Merge "GLConsumer: Fix crop math" into mnc-dev
* commit '6cd8771c9cb9512e094bc2944bb7dd38665c1838':
  GLConsumer: Fix crop math
2015-06-11 17:32:56 +00:00
Dan Stoza
68efa84e7e 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 ec4cb38750)
2015-06-11 10:20:23 -07:00
Dan Stoza
6cd8771c9c Merge "GLConsumer: Fix crop math" into mnc-dev 2015-06-11 17:12:49 +00:00
Chris Craik
b6c2d8dd6e am 58996069: am 8a4222a6: Merge "Add tracing header" into mnc-dev
* commit '58996069ae6613b54840943709517d0e4eec7a8f':
  Add tracing header
2015-06-11 02:35:27 +00:00
Aravind Akella
cd2e238ead am ce5af4b2: am 52720f45: Merge "Use LOCATION_HARDWARE permission for data injection." into mnc-dev
* commit 'ce5af4b234ed6f5d6c39d47426d4e961bf3c2858':
  Use LOCATION_HARDWARE permission for data injection.
2015-06-11 02:35:26 +00:00
Chris Craik
58996069ae am 8a4222a6: Merge "Add tracing header" into mnc-dev
* commit '8a4222a647bd17c991959eca17a50ba911c3ab6b':
  Add tracing header
2015-06-11 02:08:20 +00:00
Aravind Akella
ce5af4b234 am 52720f45: Merge "Use LOCATION_HARDWARE permission for data injection." into mnc-dev
* commit '52720f45098e9aed57c906e64a13e4a4a2173ce8':
  Use LOCATION_HARDWARE permission for data injection.
2015-06-11 02:08:19 +00:00
Chris Craik
8a4222a647 Merge "Add tracing header" into mnc-dev 2015-06-10 23:48:14 +00:00