5432 Commits

Author SHA1 Message Date
Mike Lockwood
0c5820ad8e am 151c74b3: am e976ff4a: Merge "Add a dialog to ask user to start an application for a USB device or accessory" into honeycomb-mr1
* commit '151c74b3c679a1799d01f210a2a3f4a658154320':
  Add a dialog to ask user to start an application for a USB device or accessory
2011-03-14 07:10:07 -07:00
Mike Lockwood
bce6f8f249 Add a dialog to ask user to start an application for a USB device or accessory
This is used when there is only one application available and the user has
not chosen to start it by default.
If more than one application is available we continue to use UsbResolverActivity

Bug: 4074719

Change-Id: Id61f2ccc6de5b9ac70fb4670006ff1fee2028d55
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-13 19:18:08 -04:00
Mathias Agopian
f0ff906fa4 Fix some const-ness and comments
mDrawingState doesn't need to be accessed by the
mStateLock, because by definition it's only accessed
from the main thread.

Similarily, the list of layers in the drawing state
cannot change (ie: is const).

Change-Id: I2e5da7f4d8caee7af7802b432cd45cc81c7c08b0
2011-03-11 17:01:40 -08:00
Mathias Agopian
ccf94df600 Fix initialization order warning.
Change-Id: I794dfaaa3a2f2645a89abc6c45de5f76e485f7d0
2011-03-11 17:01:40 -08:00
Eric Hassold
f667740d28 Merge "Default to NONE format in Layer" 2011-03-11 15:08:16 -08:00
Mike Lockwood
f25a7964a3 am 7e6f519c: am 14c875ea: Merge "Clear default for USB device/accessory when new matching app is installed" into honeycomb-mr1
* commit '7e6f519c0704321461e256c919b4d554f23a4261':
  Clear default for USB device/accessory when new matching app is installed
2011-03-11 13:27:56 -08:00
Mike Lockwood
14c875eac7 Merge "Clear default for USB device/accessory when new matching app is installed" into honeycomb-mr1 2011-03-11 13:24:01 -08:00
Mike Lockwood
c7d32d1065 Clear default for USB device/accessory when new matching app is installed
Bug: 4063041

Change-Id: Ia1b4f29d3e54ec21aa64407720d9d5db62855380
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-11 16:12:07 -05:00
Eric Hassold
b6c0f51d6a Default to NONE format in Layer
mFormat is not initialized with any value in Layer constructor, causing
a call to requestFormat() with no explicit format specified to fallback to
some uninitialized value. Such invalid path actually detected by valgrind.

Change-Id: Ib7faabcd61eaa26fb0ae7a9a486d9e258ba31b63
2011-03-11 12:24:23 -08:00
Dianne Hackborn
9ebdd66465 am 8657427f: am 7b076307: Merge "Fix issue #4084124: Wingray Often see black screen after market ANR due to 4084121" into honeycomb-mr1
* commit '8657427f78494df43d129d88f50e0d7375592486':
  Fix issue #4084124: Wingray Often see black screen after market ANR due to 4084121
2011-03-11 10:51:11 -08:00
Dianne Hackborn
d3ac49889e am 1bada408: am 492eb33d: Merge "Fix issue #4081756: Crash when un-stopping applications" into honeycomb-mr1
* commit '1bada408f94253c31ae49b1b00ed6263ce0ff229':
  Fix issue #4081756: Crash when un-stopping applications
2011-03-11 10:51:04 -08:00
Dianne Hackborn
7b076307bb Merge "Fix issue #4084124: Wingray Often see black screen after market ANR due to 4084121" into honeycomb-mr1 2011-03-11 10:39:46 -08:00
Dianne Hackborn
492eb33d54 Merge "Fix issue #4081756: Crash when un-stopping applications" into honeycomb-mr1 2011-03-11 10:38:52 -08:00
Mike Lockwood
dd0f9af116 am 4135cb8e: am 364903ba: Merge "Support for USB accessory URIs" into honeycomb-mr1
* commit '4135cb8e43846e422bf760fd9b856c67cc4ec8f7':
  Support for USB accessory URIs
2011-03-11 06:06:52 -08:00
Mike Lockwood
364903bac6 Merge "Support for USB accessory URIs" into honeycomb-mr1 2011-03-11 05:56:50 -08:00
Jamie Gennis
3cf78f59c0 am 34bb677f: am b2e606f5: Merge "SurfaceFlinger: Respect the PROTECTED gralloc bit." into honeycomb-mr1
* commit '34bb677f3fa7f3e476849df3c7873256a463f598':
  SurfaceFlinger: Respect the PROTECTED gralloc bit.
2011-03-10 18:10:24 -08:00
Jamie Gennis
b2e606f5f1 Merge "SurfaceFlinger: Respect the PROTECTED gralloc bit." into honeycomb-mr1 2011-03-10 18:06:32 -08:00
Mathias Agopian
007e8d24b8 am 92b56b8c: am e90c4998: Merge "fix [4025681] continuous sensors should not try to send an event as soon as they\'re activated" into honeycomb-mr1
* commit '92b56b8c5bd9a523f5d688c859bf5f74ac386b9e':
  fix [4025681] continuous sensors should not try to send an event as soon as they're activated
2011-03-10 17:40:04 -08:00
Mathias Agopian
e90c4998b5 Merge "fix [4025681] continuous sensors should not try to send an event as soon as they're activated" into honeycomb-mr1 2011-03-10 17:36:15 -08:00
Dianne Hackborn
cb44d96173 Fix issue #4084124: Wingray Often see black screen after market ANR due to 4084121
Need to resume the top activity after force removing a crashing
app's activities.

Change-Id: Id3384b2aa73039a9b1e72c2201d3ab0ef5b4f61f
2011-03-10 17:02:27 -08:00
Jamie Gennis
f72606ce3e SurfaceFlinger: Respect the PROTECTED gralloc bit.
This change makes SurfaceFlinger treat layers for which the active
buffer has the GRALLOC_USAGE_PROTECTED bit set as if they have the
'secure' flag set.

Change-Id: Ic60b6513a63e4bb92ec6ce9fd12fd39b4ba5f674
Bug: 4081304
2011-03-10 16:25:48 -08:00
Mathias Agopian
8d94d82a6d fix [4025681] continuous sensors should not try to send an event as soon as they're activated
Make sure to send an event down only for sensors that report a value only on data
change. Other sensors, will naturally send an event when the next event is available.

Bug: 4025681
Change-Id: I6d444deda388b6bc9a33e3371e09d390f1566ec5
2011-03-10 15:23:28 -08:00
Dianne Hackborn
a925cd4101 Fix issue #4081756: Crash when un-stopping applications
Change-Id: Ifc23481f8feaeacb410375eefd015ebdb997e39c
2011-03-10 13:18:20 -08:00
Mike Lockwood
024b4f1494 Support for USB accessory URIs
If a USB accessory is attached and we have no application that supports it,
display a dialog offering the user the option to visit the accessory's website
if the accessory has a URI.

Bug: 4073248

Change-Id: I30e2a802493fb6e203532a7f79402379c40bc3b8
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-10 14:35:33 -05:00
Mike Lockwood
26d7eef69e am 84edf14b: am cc08c439: Merge "UsbAccessory: Add URI string, replace type string with description" into honeycomb-mr1
* commit '84edf14b62eaf3304252bb76b0b2ca3f518c8d54':
  UsbAccessory: Add URI string, replace type string with description
2011-03-10 07:56:59 -08:00
Mike Lockwood
cc08c439bc Merge "UsbAccessory: Add URI string, replace type string with description" into honeycomb-mr1 2011-03-10 07:50:30 -08:00
Mike Lockwood
ac36d7c715 UsbAccessory: Add URI string, replace type string with description
This is a first step toward adding USB accessory URI support

BUG: 4073248

Modified USB accessory matching logic to look only at manufacturer, model and version
(description and URI are not considered when matching apps to accessories)

Also added test for USB accessory protocol version to accessorytest

BUG: 4080288

Change-Id: I992a3433c74efa7a7db37bf030f02c1f0c92f9e2
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-09 22:12:49 -05:00
Jeff Brown
5a3d6cc188 am e6f0ae12: am efd3266b: Input improvements and bug fixes.
* commit 'e6f0ae12b18819424dd8395b433a8fc9caefa77b':
  Input improvements and bug fixes.
2011-03-09 18:39:46 -08:00
Jeff Brown
efd3266b71 Input improvements and bug fixes.
Associate each motion axis with the source from which it comes.
It is possible for multiple sources of the same device to define
the same axis.  This fixes new API that was introduced in MR1.
(Bug: 4066146)

Fixed a bug that might cause a segfault when using a trackball.

Only fade out the mouse pointer when touching the touch screen,
ignore other touch pads.

Changed the plural "sources" to "source" in several places in
the InputReader where we intend to refer to a particular source
rather than to a combination of sources.

Improved the batching code to support batching events from different
sources of the same device in parallel.  (Bug: 3391564)

Change-Id: I0189e18e464338f126f7bf94370b928e1b1695f2
2011-03-09 18:30:28 -08:00
Jeff Brown
9e8e40cb5f Recognize 3D joysticks. (DO NOT MERGE)
Change-Id: Idf7799ea90fa07677850d40ee1aec39220ded372
2011-03-09 18:30:28 -08:00
Jeff Brown
18955491ee Merge "Fix off by one errors in touch motion ranges. (DO NOT MERGE)" into honeycomb-mr1 2011-03-09 18:27:25 -08:00
Jeff Brown
55605c9e24 Merge "Support POLICY_FLAG_ALT et. al. (DO NOT MERGE)" into honeycomb-mr1 2011-03-09 18:27:22 -08:00
Mike Lockwood
8fe7ca1d7d am 18d8a074: am 564f12eb: Merge changes Ifd78cca3,Ieadb86fe,If5b44ebd into honeycomb-mr1
* commit '18d8a0748d3c42a31799e5ce7c7f4c2fd63d1896':
  MTP: Convert date created and modified values from seconds to milliseconds
  Update USB accessory compatibility library to support new requestPermission API
  UsbService: Don't require permissions for UsbManager.getCurrentAccessory()
2011-03-09 15:53:43 -08:00
Mike Lockwood
18d8a0748d am 564f12eb: Merge changes Ifd78cca3,Ieadb86fe,If5b44ebd into honeycomb-mr1
* commit '564f12ebe409bead467eee04dfd719e97367e520':
  MTP: Convert date created and modified values from seconds to milliseconds
  Update USB accessory compatibility library to support new requestPermission API
  UsbService: Don't require permissions for UsbManager.getCurrentAccessory()
2011-03-09 15:50:31 -08:00
Mike Lockwood
564f12ebe4 Merge changes Ifd78cca3,Ieadb86fe,If5b44ebd into honeycomb-mr1
* changes:
  MTP: Convert date created and modified values from seconds to milliseconds
  Update USB accessory compatibility library to support new requestPermission API
  UsbService: Don't require permissions for UsbManager.getCurrentAccessory()
2011-03-09 15:47:10 -08:00
Jamie Gennis
25ea3eeb09 am 7b13e27e: am 6167a390: Merge "ANativeWindow: add queues-to-window-composer check." into honeycomb-mr1
* commit '7b13e27ee4a42c205b4a20d145610e8c912e7b0c':
  ANativeWindow: add queues-to-window-composer check.
2011-03-09 15:03:04 -08:00
Jim Miller
37bad9e7ac am c00c887c: am 5c9248f6: Merge "Fix 4027057: Improve resolution of RecentApps thumbnail images." into honeycomb-mr1
* commit 'c00c887c118849ac308f6fb1f6fad28b2929e6bb':
  Fix 4027057: Improve resolution of RecentApps thumbnail images.
2011-03-09 15:02:59 -08:00
Jamie Gennis
7b13e27ee4 am 6167a390: Merge "ANativeWindow: add queues-to-window-composer check." into honeycomb-mr1
* commit '6167a390e34981ea92fc6d5458add2da04ee15bc':
  ANativeWindow: add queues-to-window-composer check.
2011-03-09 14:59:30 -08:00
Jim Miller
c00c887c11 am 5c9248f6: Merge "Fix 4027057: Improve resolution of RecentApps thumbnail images." into honeycomb-mr1
* commit '5c9248f668201a751500f67cc60bd45ff905751a':
  Fix 4027057: Improve resolution of RecentApps thumbnail images.
2011-03-09 14:59:26 -08:00
Jamie Gennis
6167a390e3 Merge "ANativeWindow: add queues-to-window-composer check." into honeycomb-mr1 2011-03-09 14:47:56 -08:00
Jim Miller
5c9248f668 Merge "Fix 4027057: Improve resolution of RecentApps thumbnail images." into honeycomb-mr1 2011-03-09 14:42:56 -08:00
Mike Lockwood
607710ad12 UsbService: Don't require permissions for UsbManager.getCurrentAccessory()
Permission check should only happen in openAccessory()
Otherwise an application will not be able to check for the current accessory
and ask for permissions (if it is a suitable match for the application)

BUG: 4069037

Change-Id: If5b44ebda2e8077598d96629163cc74aa336589e
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-09 16:43:35 -05:00
Mike Lockwood
e18a4067e0 am 094c9900: am 2c3ed826: Merge "Change UsbManager.requestPermission to only grant permission temporarily" into honeycomb-mr1
* commit '094c9900de383f0934f74cedef0d24b6d8a14905':
  Change UsbManager.requestPermission to only grant permission temporarily
2011-03-09 10:51:16 -08:00
Mike Lockwood
094c9900de am 2c3ed826: Merge "Change UsbManager.requestPermission to only grant permission temporarily" into honeycomb-mr1
* commit '2c3ed82600af117e791a087330a198fe90d298b7':
  Change UsbManager.requestPermission to only grant permission temporarily
2011-03-09 10:48:13 -08:00
Mike Lockwood
2c3ed82600 Merge "Change UsbManager.requestPermission to only grant permission temporarily" into honeycomb-mr1 2011-03-09 10:44:19 -08:00
Irfan Sheriff
eddeecf059 am 86587185: am 7ad85eb6: Merge "Persist wifi override in airplane mode" into honeycomb-mr1
* commit '865871850bcedd4b9da0536c8b41f3c1816e5f43':
  Persist wifi override in airplane mode
2011-03-09 09:36:40 -08:00
Mike Lockwood
c6f23e8521 Change UsbManager.requestPermission to only grant permission temporarily
If the user approves an application to access a USB device or accessory
without choosing it as the default application, then permission is granted
only until the device or accessory is disconnected.
Only applications chosen as the default choice have permissions assigned persistently.

BUG: 4061035

Change-Id: Ic4f6271a91b2fc56bbeef82c579e26d88c63ae56
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-09 12:33:00 -05:00
Irfan Sheriff
865871850b am 7ad85eb6: Merge "Persist wifi override in airplane mode" into honeycomb-mr1
* commit '7ad85eb62f9f332cc8002ec996cd359333ba590e':
  Persist wifi override in airplane mode
2011-03-09 09:32:55 -08:00
Irfan Sheriff
7ad85eb62f Merge "Persist wifi override in airplane mode" into honeycomb-mr1 2011-03-09 09:30:28 -08:00
Mike Lockwood
77e1a4c57e am 093cf07f: am 9e8e4ea0: Merge changes Ib517e5e4,I93be7695,I49bf22a4 into honeycomb-mr1
* commit '093cf07f3c58a6553c415d750edba1a75b269f05':
  Close USB dialogs if their corresponding accessory or device has disconnected
  USB: Add API and dialog for apps to request permissions for USB devices and accessories
  UsbService: Automatically use system apps by default if it is the only choice
2011-03-09 03:57:14 -08:00