4748 Commits

Author SHA1 Message Date
Dianne Hackborn
fd865d0fb5 am 9b7c1274: am e2e8da7c: am 7c2e76f0: Merge "Improve error reporting for issue #3183612" into gingerbread
* commit '9b7c1274ddba8db2842431649d46c4cef510131f':
  Improve error reporting for issue #3183612
2011-03-15 15:47:32 -07:00
Dianne Hackborn
9b7c1274dd am e2e8da7c: am 7c2e76f0: Merge "Improve error reporting for issue #3183612" into gingerbread
* commit 'e2e8da7c734b71c4b6b81e51e16ce3f4061f0f07':
  Improve error reporting for issue #3183612
2011-03-15 15:44:18 -07:00
Dianne Hackborn
e2e8da7c73 am 7c2e76f0: Merge "Improve error reporting for issue #3183612" into gingerbread
* commit '7c2e76f0a4daa7e4316e7a85d41d3c391319d955':
  Improve error reporting for issue #3183612
2011-03-15 14:49:45 -07:00
Mike Lockwood
3c9aa1aa09 am b0976320: Merge "DO NOT MERGE: Backport more USB accessory changes from honeycomb" into gingerbread
* commit 'b09763209980ff9210cc353f2410598220ec0480':
  DO NOT MERGE: Backport more USB accessory changes from honeycomb
2011-03-15 14:49:37 -07:00
Kenny Root
d022c23aed Merge "Revise free space checks for package installs" 2011-03-15 14:48:56 -07:00
Dianne Hackborn
7c2e76f0a4 Merge "Improve error reporting for issue #3183612" into gingerbread 2011-03-15 14:40:56 -07:00
Dianne Hackborn
1ab43775d8 Improve error reporting for issue #3183612
java.lang.SecurityException: Neither user 1209 nor current process
has android.permission.WAKE_LOCK.

Change-Id: I465972ab91b007e04b2ac62550f78583956a4048
2011-03-15 14:38:02 -07:00
Mike Lockwood
638d7cb3ee DO NOT MERGE: Backport more USB accessory changes from honeycomb
Change-Id: I8459c5ab9fbf0b3cad752041484a5de44ca9badd
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-15 16:50:18 -04:00
satok
d46bbaeb27 am f057524d: am b02b8369: Merge "Remove a workaround for the data inconsistency of SystemProperties" into honeycomb-mr1
* commit 'f057524db620c490e96fa886238f3b31bd973060':
  Remove a workaround for the data inconsistency of SystemProperties
2011-03-14 22:51:21 -07:00
satok
f057524db6 am b02b8369: Merge "Remove a workaround for the data inconsistency of SystemProperties" into honeycomb-mr1
* commit 'b02b8369c6549417561e2ae1467b615645b5d04c':
  Remove a workaround for the data inconsistency of SystemProperties
2011-03-14 22:47:11 -07:00
Kenny Root
62e1b4e9d4 Revise free space checks for package installs
Change-Id: Ie72bbab77aa89a50ec096edc1f471eab74829e67
2011-03-14 17:18:24 -07:00
Wink Saville
c15cf6353e Merge "Do not merge: Revert the revert of "LTE Changes for Telephony including Multiple PDN support and IPV6 support"" into honeycomb-LTE 2011-03-14 13:40:58 -07:00
Mike Lockwood
ccdac700df am 78b8e1be: Merge "DO NOT MERGE: backport recent USB accessory changes from honeycomb" into gingerbread
* commit '78b8e1be97c61f7e0b28b145fadd0c646fd1c46b':
  DO NOT MERGE: backport recent USB accessory changes from honeycomb
2011-03-14 13:37:54 -07:00
satok
b548a3cfa0 Remove a workaround for the data inconsistency of SystemProperties
Bug: 3473532
Reverting: Ie3f5b484b5574e10a4

Depends on Bug: 3511230
This must be fixed before submitting this CL.

Change-Id: I435a294a818bec5675f0ada00d81c1b3e37d1dce
2011-03-14 12:38:34 -07:00
Wink Saville
9d7d62801d Do not merge: Revert the revert of "LTE Changes for Telephony including Multiple PDN support and IPV6 support"
This reverts commit eca208fae6d1b6ae9c8c0e42eee092e86dbddbb7
and is the first of the LTE commits in master being back ported
to the LTE branch.

Change-Id: I17d4a1b779ed74bc7dfb409d2c1a30f60fdb27c7
2011-03-14 12:25:04 -07:00
Irfan Sheriff
fd10d5cf56 am fb897110: am 9b1ea0bd: am e21110f8: Merge "Backup and restore IP and proxy settings" into honeycomb-mr1
* commit 'fb8971106e5ea105e176c995c1ff3b4fbe630710':
  Backup and restore IP and proxy settings
2011-03-14 12:10:27 -07:00
Irfan Sheriff
e21110f8b1 Merge "Backup and restore IP and proxy settings" into honeycomb-mr1 2011-03-14 11:48:35 -07:00
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
Mike Lockwood
2cc0377200 DO NOT MERGE: backport recent USB accessory changes from honeycomb
Bug: 4082651

Change-Id: Ie7c2fc796dd3c64f803acbd14210e5949683f4ed
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-11 20:02:43 -05: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
Robert Greenwalt
2e7415564a am b5c51d5f: Merge "DO NOT MERGE Backport of I1f55df8a from master." into gingerbread
* commit 'b5c51d5fa88c56ebbfb56af89beb077aa4f1f2f8':
  DO NOT MERGE Backport of I1f55df8a from master.
2011-03-11 11:52:31 -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
Robert Greenwalt
6b09916eb2 DO NOT MERGE Backport of I1f55df8a from master.
Fixes false reporting of NO_CONNECTION.
bug:4057115

Change-Id: Ie11e81180276ac3aa486607ec3a8eb1088b2ece6
2011-03-10 17:04:21 -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
Irfan Sheriff
4aeca7c590 Backup and restore IP and proxy settings
Bug: 4081954
Change-Id: I27266637c6ade0c5c8242792176d1edae0983446
2011-03-10 16:57:10 -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
TK MUN
c01fd043a9 am 4bdab175: DO NOT MERGE WiMAX support
* commit '4bdab1751f0db3b2f03e8c58ef5c11a543dfa3c7':
  DO NOT MERGE WiMAX support
2011-03-09 22:54:44 -08:00
TK MUN
4bdab1751f DO NOT MERGE WiMAX support
- In Connectivity service, start WiMAX service
- 4G icon display in StatusBarPolicy
- Add DHCP renew
- Add radio for WiMAX

Change-Id: Iffff012b270d80e84ec8fbd4486921a8adb847dd
Signed-off-by: TK MUN <tk.mun@samsung.com>
2011-03-09 22:37:08 -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
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
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
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
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
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
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