Brad Fitzpatrick
f68098534e
am 7a84a60d: am 1a5a2379: Merge "Unregister callback from binder when vibration is removed"
...
* commit '7a84a60d569ef7373fbb6418026b935d48fcd7e7':
Unregister callback from binder when vibration is removed
2011-03-30 08:20:51 -07:00
Mike Lockwood
08d5de8339
am cd90d1f1: am 44e4b99f: Merge "UsbService: Make USB disconnect handling for accessory mode more robust" into honeycomb-mr1
...
* commit 'cd90d1f1173c344738362d24bdc637c355b75645':
UsbService: Make USB disconnect handling for accessory mode more robust
2011-03-29 22:17:36 -07:00
Mike Lockwood
cd90d1f117
am 44e4b99f: Merge "UsbService: Make USB disconnect handling for accessory mode more robust" into honeycomb-mr1
...
* commit '44e4b99f823a6d6131f94e67389b705d3b124c0a':
UsbService: Make USB disconnect handling for accessory mode more robust
2011-03-29 22:16:17 -07:00
Mike Lockwood
4f0f3561ed
UsbService: Make USB disconnect handling for accessory mode more robust
...
Handle the case where the kernel driver is in accessory mode but we failed
to initialize it at the framework level. On disconnnect, check to see if the
accessory kernel driver is enabled rather than checking mCurrentAccessory.
That way we will restore the USB state in the kernel even if mCurrentAccessory
is null.
Change-Id: I35d458f21a8b21611946da523d0f53723cab0540
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-29 16:59:38 -07:00
Brad Fitzpatrick
7a84a60d56
am 1a5a2379: Merge "Unregister callback from binder when vibration is removed"
...
* commit '1a5a2379eb3a6cf16fb153aecbc4ac9e85d3ed42':
Unregister callback from binder when vibration is removed
2011-03-28 08:15:35 -07:00
Mathias Jeppsson
b23949b745
Unregister callback from binder when vibration is removed
...
When creating new vibration pattern, a callback is registered
in case binding to caller goes away, by linkToDeath().
Need to unregister this callback when we throw away the vibration.
Change-Id: Ibdf0bd415a539054ac7a66f49b33a864f729c546
2011-03-24 08:49:12 +01:00
Robert Greenwalt
5635dc9313
am 0b6d0445: am ac70fb8b: Merge "Fix adding of default route." into honeycomb-mr1
...
* commit '0b6d044567b9c3004eb7ed826fd593019cd24352':
Fix adding of default route.
2011-03-22 21:39:19 -07:00
Robert Greenwalt
0b6d044567
am ac70fb8b: Merge "Fix adding of default route." into honeycomb-mr1
...
* commit 'ac70fb8be6ea3a6b49d0a8a26e99c25f92013516':
Fix adding of default route.
2011-03-22 21:37:48 -07:00
Robert Greenwalt
edcb4f9d56
Fix adding of default route.
...
If you deleted the host routes (started a secondary network like mms, supl
of hipri and then ended it) you would lose the host route to the default
gateway. Then if you needed to re-add the default gateway route (lost
the connection and removed the default route and then re-established)
you couldn't - can't add a gateway that isn't routable apparently.
This happens if you are in a video chat and lose your connection without
losing the interface (PPP keeps it up for a bit).
Fixed it by having addDefaultRoute first add a hsot route for the gateway
before adding the default route. This allows the default add to succeed.
bug:3490353
Change-Id: I415e7319832e6456f8757b14c4f79f098a08839b
2011-03-22 18:47:42 -07:00
Mike Lockwood
9a612b545e
am 65de3c76: DO NOT MERGE: UsbService: Handle the case where a USB accessory connects as the device is booting
...
* commit '65de3c76874386a5c1ffd26690451ecdef972a9e':
DO NOT MERGE: UsbService: Handle the case where a USB accessory connects as the device is booting
2011-03-20 17:37:33 -07:00
Mike Lockwood
433567b57c
am 56063c8d: am dd76dc02: Merge "UsbService: Handle the case where a USB accessory connects as the device is booting" into honeycomb-mr1
...
* commit '56063c8d62d0574409a8150d580993c8d8e0f14f':
UsbService: Handle the case where a USB accessory connects as the device is booting
2011-03-20 17:33:01 -07:00
Mike Lockwood
56063c8d62
am dd76dc02: Merge "UsbService: Handle the case where a USB accessory connects as the device is booting" into honeycomb-mr1
...
* commit 'dd76dc0297f4c39fefbbc1ac23d9b1add187d9e9':
UsbService: Handle the case where a USB accessory connects as the device is booting
2011-03-20 17:25:09 -07:00
Mike Lockwood
65de3c7687
DO NOT MERGE: UsbService: Handle the case where a USB accessory connects as the device is booting
...
Bug: 4129297
Change-Id: I33963b0a667976d8100a60b27d66bfd0d57373e2
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-19 14:38:54 -04:00
Mike Lockwood
1c0e543638
UsbService: Handle the case where a USB accessory connects as the device is booting
...
Bug: 4129297
Change-Id: I8f9d085805fb598572f9b00952c3cd38cfab461b
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-19 12:03:46 -04:00
James Dong
14438b81a1
am 970bad67: am be368de7: Merge "Fix missing AOSP copyright headers for more files" into honeycomb-mr1
...
* commit '970bad677585b3cba1ff1b48db9040c2005bd907':
Fix missing AOSP copyright headers for more files
2011-03-17 18:00:19 -07:00
James Dong
970bad6775
am be368de7: Merge "Fix missing AOSP copyright headers for more files" into honeycomb-mr1
...
* commit 'be368de7b7614e89bae8fb59ea4283eba890a2c1':
Fix missing AOSP copyright headers for more files
2011-03-17 17:55:48 -07:00
Mike Lockwood
f63113d158
am a5b68f39: am 5982bf66: GPS: Restore XTRA downloading at boot.
...
* commit 'a5b68f39e2936a83eac0b995992724cd5de6905d':
GPS: Restore XTRA downloading at boot.
2011-03-17 16:25:01 -07:00
Mike Lockwood
a5b68f39e2
am 5982bf66: GPS: Restore XTRA downloading at boot.
...
* commit '5982bf66d4fdea38105d91ff0f9d38660ac87581':
GPS: Restore XTRA downloading at boot.
2011-03-17 16:20:56 -07:00
James Dong
199d1c131d
Fix missing AOSP copyright headers for more files
...
o Update the copyright date on InputDispatcher_test.cpp and InputReader_test.cpp
because these two files were moved from other places to the current location,
and were actually created in 2010.
bug - 4119349
Change-Id: Ic93b81ddafb58e9e72a2e9e02ca3d9f173d6dca7
2011-03-17 14:43:12 -07:00
Mike Lockwood
5982bf66d4
GPS: Restore XTRA downloading at boot.
...
Between Froyo and Gingerbread we disabled scheduling an XTRA data download
at boot because the Qualcomm engineers thought it should not be necessary.
However, some users noticed a GPS performance degradation after receiving
their Gingerbread update, and some reported forcing an XTRA download cleared
up the problem. This change restores the Froyo behavior of downloading
XTRA data after boot.
Bug: 3509901
Change-Id: I5a52201a2b24ce4a5d3ddb1f86340e3d5387f603
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-17 14:08:01 -04:00
Paul Milovanov
074903a95b
am eca7ff02: am 87f50f19: Merge "PACKAGE_FIRST_LAUNCH intent sent to wrong pkg" into honeycomb-mr1
...
* commit 'eca7ff02fb6e75d4355565f05abf8f3af51731a0':
PACKAGE_FIRST_LAUNCH intent sent to wrong pkg
2011-03-17 10:29:50 -07:00
Paul Milovanov
eca7ff02fb
am 87f50f19: Merge "PACKAGE_FIRST_LAUNCH intent sent to wrong pkg" into honeycomb-mr1
...
* commit '87f50f19eef2e70fcf7294c3b9cd5ca0344b99ee':
PACKAGE_FIRST_LAUNCH intent sent to wrong pkg
2011-03-17 10:26:32 -07:00
Paul Milovanov
87f50f19ee
Merge "PACKAGE_FIRST_LAUNCH intent sent to wrong pkg" into honeycomb-mr1
2011-03-17 10:23:48 -07:00
Paul Milovanov
a57db345d3
PACKAGE_FIRST_LAUNCH intent sent to wrong pkg
...
In PackageManagerService, intent with ACTION_PACKAGE_FIRST_LAUNCH was
being sent to wrong package. It was being sent to the installed
package with installer package in the URI, whereas it should be sent
to installer package with installed package in the URI.
Comment in Intent.java:1417 seems to support that intent with this
action should be sent to the installer package, not installed.
Bug: 3426299
Change-Id: Iadec4ae7a1af6bab434716f8fcdb7d0b099d1ee1
2011-03-16 23:12:31 -07:00
Adam Cohen
6decf37c98
am afcb65c2: am 296c1616: Merge "Catching all Exceptions when calling through to RemoteViewsFactory" into honeycomb-mr1
...
* commit 'afcb65c2fdc6892a605fced93da13f6ff455bd2b':
Catching all Exceptions when calling through to RemoteViewsFactory
2011-03-16 18:04:49 -07:00
Adam Cohen
afcb65c2fd
am 296c1616: Merge "Catching all Exceptions when calling through to RemoteViewsFactory" into honeycomb-mr1
...
* commit '296c1616bad5a075cf64c2ba025b0cfd6bb3816d':
Catching all Exceptions when calling through to RemoteViewsFactory
2011-03-16 18:03:23 -07:00
Adam Cohen
c2be22cf20
Catching all Exceptions when calling through to RemoteViewsFactory
...
Change-Id: Ib20c880bb7626565541ab4697317fcfaa2e6b5b7
2011-03-16 16:33:53 -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
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
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
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
e21110f8b1
Merge "Backup and restore IP and proxy settings" into honeycomb-mr1
2011-03-14 11:48:35 -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
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
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
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