Commit Graph

52847 Commits

Author SHA1 Message Date
David Srbecky
0a394f5428 Merge commit '3822b8b7' into mnc-dev-plus-aosp 2015-06-19 20:36:37 +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
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
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
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
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
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
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
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
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
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
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
Aravind Akella
52720f4509 Merge "Use LOCATION_HARDWARE permission for data injection." into mnc-dev 2015-06-10 22:56:27 +00:00
Aravind Akella
a8814ce478 Use LOCATION_HARDWARE permission for data injection.
Change-Id: Ie81cb0d5f537d5431f2127891cca1d39c969ee7b
2015-06-10 15:15:57 -07:00
Dan Stoza
19174ceb57 am 430f5f5a: am 127cf2ef: Merge "SF: Swap w/h when capturing rotated screenshots"
* commit '430f5f5a6203cf6a4d688bc59a7082eb517533e3':
  SF: Swap w/h when capturing rotated screenshots
2015-06-10 20:36:51 +00:00
Chris Craik
6a40d678ea Add tracing header
bug:21195272

Change-Id: I520de9fee7fc40d0570d6bef450d756ce42a1462
2015-06-10 13:10:47 -07:00
Dan Stoza
430f5f5a62 am 127cf2ef: Merge "SF: Swap w/h when capturing rotated screenshots"
* commit '127cf2eff638a98c5318ba8b3edaf3ca651c4090':
  SF: Swap w/h when capturing rotated screenshots
2015-06-10 18:21:55 +00:00
Dan Stoza
127cf2eff6 Merge "SF: Swap w/h when capturing rotated screenshots" 2015-06-10 18:10:07 +00:00
Dan Stoza
355950c1fc am d177e044: Merge "SF: Swap w/h when capturing rotated screenshots" into mnc-dev
* commit 'd177e044d129bbecc3900a7fcd442b354de768df':
  SF: Swap w/h when capturing rotated screenshots
2015-06-10 17:52:50 +00:00
Christopher Tate
633b35b4dc am 2560442a: Merge "Prevent integer overflow when calculating buffer resizes" into mnc-dev
* commit '2560442a1ed7e21b9d941218d2e9e203626fa731':
  Prevent integer overflow when calculating buffer resizes
2015-06-10 17:52:50 +00:00
Dan Stoza
65dc7eeff0 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 3502416204)
2015-06-10 10:33:21 -07:00
Michael Wright
f8b34319a4 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.
2015-06-10 17:32:41 +00:00
Dan Stoza
d177e044d1 Merge "SF: Swap w/h when capturing rotated screenshots" into mnc-dev 2015-06-10 17:28:33 +00:00
Christopher Tate
2560442a1e Merge "Prevent integer overflow when calculating buffer resizes" into mnc-dev 2015-06-10 17:26:44 +00:00
Dan Stoza
ec4cb38750 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
2015-06-10 10:24:51 -07:00
Michael Wright
043bd36b0d Merge "Only log dropped input when disabled for the first event." into mnc-dev 2015-06-10 17:08:03 +00:00
Michael Wright
3a98172289 Only log dropped input when disabled for the first event.
Bug: 19851495
Change-Id: I8cb8076723c1ca1732c3bc37f283d8eb48b7bee0
2015-06-10 15:26:13 +01:00
Erik Kline
78c8a7005c am 47a7dc81: Merge "Incorporate network diagnostics during a bugreport" into mnc-dev
* commit '47a7dc81d0fedc1e85091f0e8a868768d0e8cadd':
  Incorporate network diagnostics during a bugreport
2015-06-09 23:47:36 +00:00
Dan Stoza
3502416204 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
2015-06-09 16:46:20 -07:00
Erik Kline
47a7dc81d0 Merge "Incorporate network diagnostics during a bugreport" into mnc-dev 2015-06-09 23:24:54 +00:00