Commit Graph

52909 Commits

Author SHA1 Message Date
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
Aravind Akella 12b26278df am e6045537: am 7a1b5d5d: Merge "Fix crash in SensorService. Ignore devices with no sensors." into mnc-dev
* commit 'e6045537bbce4c4f98e6a1149187bbcdaff57bcd':
  Fix crash in SensorService. Ignore devices with no sensors.
2015-06-24 16:08:13 +00: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
Dan Stoza e2bfdfafae am c8c0992a: am 0638a4fa: Merge "libgui/SF: Propagate SECURE Layer flag changes" into mnc-dev
* commit 'c8c0992ace7733c983e87e8e7154d844a54e5741':
  libgui/SF: Propagate SECURE Layer flag changes
2015-06-23 18:13:16 +00:00
Michael Wright 39c32ecf37 am 7d3ad695: Merge commit \'71997c1a\' into manualmerge
* commit '7d3ad695304a1f24026227e630add6edd76fd0d6':
  Add new AINPUT_SOURCE_BLUETOOTH_STYLUS
2015-06-23 18:13:15 +00: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 ccb52820d8 am cc62b6c6: am 18c77330: Merge "Add method to set action button on MotionEvent" into mnc-dev
* commit 'cc62b6c65eb51b62774882c53c53e20c336bc998':
  Add method to set action button on MotionEvent
2015-06-23 13:25:03 +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 645832b969 am 357e7d7d: am 94188464: Merge "More information in sensor bugreports." into mnc-dev
* commit '357e7d7dcdd579d979054daf0a28b0a348d7ee7a':
  More information in sensor bugreports.
2015-06-22 18:53:32 +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 f9aca2e2c5 am a34e4a39: am 528c8ddc: Rename --include-cfi to --generate-debug-info.
* commit 'a34e4a398b708e1cca6de3448953a07169fb40e0':
  Rename --include-cfi to --generate-debug-info.
2015-06-19 20:04:16 +00:00
David Srbecky 3141673a8b am 0a394f54: Merge commit \'3822b8b7\' into mnc-dev-plus-aosp
* commit '0a394f54284d1d6006cf938b1da28bb365aa52b9':
  Installd: Add debug.gencfi to run_dex2oat
2015-06-19 20:04:15 +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
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
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