summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am d581c047: Add missing copyright headers for a couple of files. DO NOT ↵James Dong2011-03-072-0/+32
|\ | | | | | | | | | | | | MERGE Cherry-picked from other branch... * commit 'd581c04722e2610ca5471b9c3d1881043b1205b1': Add missing copyright headers for a couple of files. DO NOT MERGE Cherry-picked from other branch...
| * Add missing copyright headers for a couple of files. DO NOT MERGEJames Dong2011-03-072-0/+32
| | | | | | | | | | | | | | | | Cherry-picked from other branch... bug - 4025673 Change-Id: I6fd1baaf5625297fb1e358de3a3a632a7f5deb90
* | am ff5a0990: Added to check for supporting mms content-disposition, utf8 ↵Soojung Shin2011-03-043-43/+103
|\ \ | |/ | | | | | | | | | | decoding. * commit 'ff5a09904fb05f2776f1bbf1dd3915f38031190c': Added to check for supporting mms content-disposition, utf8 decoding.
| * Added to check for supporting mms content-disposition, utf8 decoding.Soojung Shin2011-03-043-43/+103
| | | | | | | | | | Change-Id: Ieae1bb2ac36675f569fb21285ca6ef289c367bf7 Signed-off-by: Soojung Shin <sj46.shin@samsung.com>
* | am b028ce55: Merge "Add a protocol property to the APNs and use it." into ↵Lorenzo Colitti2011-03-036-29/+215
|\ \ | |/ | | | | | | | | | | gingerbread * commit 'b028ce55cac88f1778cdad59c63c52a5b66afb69': Add a protocol property to the APNs and use it.
| * Merge "Add a protocol property to the APNs and use it." into gingerbreadLorenzo Colitti2011-03-036-29/+215
| |\
| | * Add a protocol property to the APNs and use it.Lorenzo Colitti2011-02-286-29/+215
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Database changes: - Add a protocol and a roaming_protocol column to the carriers table in the telephony provider database. - Set the protocol and roaming_protocol fields when creating APN objects from the database. 2. ApnSetting class changes: - Add protocol and roamingProtocol fields to the ApnSetting class that encapsulates APN settings within the framework. - Add the fields to ApnSetting.toString and support a new syntax containing the fields in ApnSetting.fromString. - Add a unit test for ApnSetting. 3. Telephony changes: - Specify the APN protocol when setting up a data call, using protocol when not roaming and roaming_protocol when roaming. This change depends on #86896 in the telephony provider, which adds the new column to the database schema on upgrades. Bug: 3333633 Change-Id: If3d9ed4c851d0192849df0d64581db03b066e052
* | | am 6987036f: Merge "Make setupDataCall take a protocol parameter." into ↵Lorenzo Colitti2011-03-037-21/+38
|\ \ \ | |/ / | | | | | | | | | | | | | | | gingerbread * commit '6987036fabbd2c0351986efcfd11e714ae75fdf8': Make setupDataCall take a protocol parameter.
| * | Merge "Make setupDataCall take a protocol parameter." into gingerbreadLorenzo Colitti2011-03-037-21/+38
| |\ \ | | |/
| | * Make setupDataCall take a protocol parameter.Lorenzo Colitti2011-02-287-21/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport the protocol changes to setupDataCall and its callers from master. As in master, hardcode IPv4 connectivity for now. When we add the protocol field to ApnSettings, it will be fetched from there. Bug: 3333633 Change-Id: I51880bc0ec192cbf964ac7bbd6a4b7d2eed41d27
* | | am e23c235c: Merge "Only set KeyEvent long press flag when repeat count ↵Jeff Brown2011-03-031-4/+6
|\ \ \ | |/ / | | | | | | | | | | | | | | | equals 1." into gingerbread * commit 'e23c235c662c3028cfb080c6ed60d7defcdd0b69': Only set KeyEvent long press flag when repeat count equals 1.
| * | Merge "Only set KeyEvent long press flag when repeat count equals 1." into ↵Jeff Brown2011-03-031-4/+6
| |\ \ | | | | | | | | | | | | gingerbread
| | * | Only set KeyEvent long press flag when repeat count equals 1.Jeff Brown2011-03-021-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a Gingerbread regression. Bug: 3507021 Change-Id: Ia6030665b6a406332adc0ee0d8ee3cb735338c8e
* | | | am 611af238: DO NOT MERGE: UsbManager: Don\'t display activity picker if ↵Mike Lockwood2011-03-021-1/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | there are no apps available for an accessory * commit '611af238185cf924a425a1a2154b8439b8f8d7a5': DO NOT MERGE: UsbManager: Don't display activity picker if there are no apps available for an accessory
| * | | DO NOT MERGE: UsbManager: Don't display activity picker if there are no apps ↵Mike Lockwood2011-03-021-1/+4
| |/ / | | | | | | | | | | | | | | | | | | available for an accessory Change-Id: I1aa578887e42aef375211eadece4c1fddaf234f8 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | am c9ac3f51: Merge "DO NOT MERGE: UsbService: Make sure the USB accessory ↵Mike Lockwood2011-03-021-29/+20
|\ \ \ | |/ / | | | | | | | | | | | | | | | function is disabled when we disconnect" into gingerbread * commit 'c9ac3f5183be3f124f34ed49ac5766e0ba1aff77': DO NOT MERGE: UsbService: Make sure the USB accessory function is disabled when we disconnect
| * | Merge "DO NOT MERGE: UsbService: Make sure the USB accessory function is ↵Mike Lockwood2011-03-021-29/+20
| |\ \ | | | | | | | | | | | | disabled when we disconnect" into gingerbread
| | * | DO NOT MERGE: UsbService: Make sure the USB accessory function is disabled ↵Mike Lockwood2011-03-021-29/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when we disconnect BUG: 3493041 Change-Id: I6aeb00a1d91d98a5a0aef4ed97ca5ba68daa24be Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | am edc68a00: Merge "Attempt to reduce problems from issue #3183612" into ↵Simon Wilson2011-03-021-0/+18
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | gingerbread * commit 'edc68a001cd94d2011029004cb27231432a18575': Attempt to reduce problems from issue #3183612
| * | | Merge "Attempt to reduce problems from issue #3183612" into gingerbreadSimon Wilson2011-03-021-0/+18
| |\ \ \ | | |/ / | |/| |
| | * | Attempt to reduce problems from issue #3183612Dianne Hackborn2011-02-091-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | java.lang.SecurityException: Neither user 1209 nor current... ...process has android.permission.WAKE_LOCK. It looks like, somehow, the calling uid/pid of the SyncHandler thread is getting corrupted. This change has Looper check for these values changing from their original defaults and, if there is a problem, resetting them and logging a WTF. Hopefully this will avoid crashing the process, while also giving us more helpful error reports about what is going on. Change-Id: Iff06d575951fb8c06e2a3c31141f2907a715eb81
* | | | am 1110748b: DO NOT MERGE: USB accessory support libraryMike Lockwood2011-03-0214-2/+1317
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '1110748b2df664f9c5066819c1f0616eae3394a7': DO NOT MERGE: USB accessory support library
| * | | DO NOT MERGE: USB accessory support libraryMike Lockwood2011-03-0214-2/+1317
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This provides a mechanism for developing applications to work with USB accessories in versions of android prior to the introduction of the android.hardware.UsbManager APIs. Applications should link against the com.android.future.usb.accessory library to use this support. Change-Id: I0b61e20b63eec42c506f0895a0c9a439bdfdf7f5 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | am 40bbf929: DO NOT MERGE: Backport USB accessory support to gingerbreadMike Lockwood2011-03-0225-376/+1956
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '40bbf9295d5245d3917629ce15f7b37670aef1ac': DO NOT MERGE: Backport USB accessory support to gingerbread
| * | | DO NOT MERGE: Backport USB accessory support to gingerbreadMike Lockwood2011-03-0125-376/+1956
| | | | | | | | | | | | | | | | Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | am db52ab69: Merge "DO NOT MERGE Backport (with modifications ) some changes ↵Costin Manolache2011-03-014-16/+135
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | from Honeycomb, that would allow authenticators to control caching and permissions." into gingerbread * commit 'db52ab69f22e24615eaa2e8f9845e157426d3dd6': DO NOT MERGE Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions.
| * | | Merge "DO NOT MERGE Backport (with modifications ) some changes from ↵Costin Manolache2011-03-014-16/+135
| |\ \ \ | | | | | | | | | | | | | | | Honeycomb, that would allow authenticators to control caching and permissions." into gingerbread
| | * | | DO NOT MERGECostin Manolache2011-03-014-16/+135
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions. This is backward compatible - both new and old authenticators will work with old and new framework, but the functionality will only be present if both sides support it. Change-Id: Ib2838cc2159f45264b38c844cd4c1d6f315d8064
* | | | am 1de4a2ca: am 62619392: Merge "Fix leak when keylock is recreated."Dianne Hackborn2011-02-281-1/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * commit '1de4a2ca58df9bd21e054742f52e0af7a2ed5864': Fix leak when keylock is recreated.
| * \ \ \ am 62619392: Merge "Fix leak when keylock is recreated."Dianne Hackborn2011-02-281-1/+14
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '626193926df0b3c7236e5c244f30d797d9192e0d': Fix leak when keylock is recreated.
| | * \ \ \ Merge "Fix leak when keylock is recreated."Dianne Hackborn2011-02-281-1/+14
| | |\ \ \ \
| | | * | | | Fix leak when keylock is recreated.Kenneth Andersson2011-02-281-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DigitalClock could sometimes leak when the keylock was recreated. This happened because onDetachedFromWindow() was called BEFORE onAttachedFromWindow(). This is the flow that causes the memory leak: 1) The LockPatternKeyGuardView is created and added. This will start a loop dispatching onAttachedToWindow() to all views involved. 2) PatternUnlockScreen.onAttachedToWindow() is called 3) If the configuration has changed since creation, recreateMe() in LockPatternKeyguardView.java is called. 4) recreateScreens() is called 5) PatternUnlockScreen is removed (to be re-added later) in LockPatternKeyguardView.recreateUnlockScreen() 6) Since DigitalClock is a part of PatternUnlockScreen, its onDetachedFromWindow() will be called. 7) The loop started in 1) will continue to dispatch onAttachedToWindow() - and will eventually call DigitalClock.onAttachedToWindow() 8) DigitalClock.onAttachedToWindow() registers a receiver that is normally unregistered in onDetachedFromWindow(). But since onDetachedFromWindow was already called in 6), it will not be called again. 9) The receiver has leaked, and it has a reference to DigitalClock, so that will leak as well, together with its parents e.g. PatternUnlockScreen and LockPatternKeyguardView The fix is to wait with the recreation of the screens (in 4) until the loop (in 1) is finished. This is done by posting this as an event instead of calling recreateScreens() immediately. It is possible that this a fix for the root cause mentioned in "Fix 3106227: use WeakReferences for receivers in DigitalClock class" 8b886fab5496b0b1f5193f21855220176deddc37 by Jim Miller <jaggies@google.com>. Change-Id: I6a5f6f49a565d459bf4e285f34f053cc1022286f
* | | | | | | am 9711b9b7: am 1eefb529: Merge "Phone crash when old callback func is woken ↵Jaikumar Ganesh2011-02-281-0/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | up when enabling BT." * commit '9711b9b7aa7448b44b85fe8158ded0364cc3540e': Phone crash when old callback func is woken up when enabling BT.
| * | | | | | am 1eefb529: Merge "Phone crash when old callback func is woken up when ↵Jaikumar Ganesh2011-02-281-0/+2
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | enabling BT." * commit '1eefb529c78be5336f6c8a1b8ac2c32e268d4294': Phone crash when old callback func is woken up when enabling BT.
| | * | | | | Merge "Phone crash when old callback func is woken up when enabling BT."Jaikumar Ganesh2011-02-281-0/+2
| | |\ \ \ \ \
| | | * | | | | Phone crash when old callback func is woken up when enabling BT.Staffan Lindvall2011-01-131-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the remote Jerry device is powered down the BT link to the phone is dropped, and the Jerry firmware in the phone quite immediately tries to re-connect to the Jerry device. Then SDP and Discover Services is started, fetchRemoteUuids() -> discoverServicesNative(). This results in an asynchronous dbus call dbus_func_args_async() that is provided with a callback function, onDiscoverServicesResult(), but before this callback function is used Bluetooth is disabled according to the problem scenario above. For some reason this discover services activity is not cleared when Bluetooth is disabled, so when Bluetooth is enabled again the (old) callback function onDiscoverServicesResult() is executed, but the following getAddressFromObjectPath() fails. The reason for this is that the deviceObjectPath parameter contains an old value, containg the process id of the old bluetoothd (the one running before Bluetooth was disabled). Then the new updated AdapterObjectPath /org/bluez/<new bluetooth hd pid>/hci0/dev_ is not a prefix of the old deviceObjectPath /org/bluez/<old bluetooth hd pid>/hci0/dev_<BT_ADDR>, which results in that null will be used as address in sendUuidIntent(), and later on, ending up in the BluetoothDevice constructor where and IllegalArgumentExceotion is thrown due to Bluetooth address = null. Then the phone will crash. Making sure sendUuidIntent() is not called when address is null is a work-around for the problem. Change-Id: I8ff60bad80de3b379cef0970402943dfa4de3cfd
* | | | | | | | am 61c1bb4f: Merge "UsbService: Remove stack-trace message during boot. DO ↵Mike Lockwood2011-02-281-4/+9
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into gingerbread * commit '61c1bb4fef439650a3b88131c6e1360ffc03a7ed': UsbService: Remove stack-trace message during boot. DO NOT MERGE
| * | | | | | | Merge "UsbService: Remove stack-trace message during boot. DO NOT MERGE" ↵Mike Lockwood2011-02-281-4/+9
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread
| | * | | | | | | UsbService: Remove stack-trace message during boot. DO NOT MERGEDavid 'Digit' Turner2011-02-271-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes a stack trace message during the boot under emulation. The observers tried to access a null reference when no USB configuration is supported by the emulated device. So do not start them in this case. + Change a Slog.w into a Slog.i since this is an acceptable condition. Change-Id: I801f352574716d7868f182bb6e5ee49e5b12e4f1
* | | | | | | | | am 6da062a9: Merge "DO NOT MERGE: Clean up USB notifications:" into gingerbreadMike Lockwood2011-02-284-97/+86
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6da062a96c6f8126aad450a937144fab4333488f': DO NOT MERGE: Clean up USB notifications:
| * | | | | | | | Merge "DO NOT MERGE: Clean up USB notifications:" into gingerbreadMike Lockwood2011-02-284-97/+86
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | DO NOT MERGE: Clean up USB notifications:Mike Lockwood2011-02-274-97/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for separate USB connected and configuration events Include both USB connected/disconnected and configuration state in USB_STATE Intent Remove redundant USB_CONNECTED and USB_DISCONNECTED Intents Now we just have the sticky USB_STATE broadcast Move USB disconnnect rebouncing from Tethering to UsbService Change-Id: I1dea480f4b0daf14247cf37c5f2060498882c002 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | | | am 3333f8af: Merge "DO NOT MERGE UsbManager: squashed commit of:" into ↵Mike Lockwood2011-02-289-73/+145
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread * commit '3333f8afb2d1eae8bfdb41fa87f86836ad8702f7': DO NOT MERGE UsbManager: squashed commit of:
| * | | | | | | | Merge "DO NOT MERGE UsbManager: squashed commit of:" into gingerbreadMike Lockwood2011-02-289-73/+145
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | DO NOT MERGE UsbManager: squashed commit of:Mike Lockwood2011-02-279-73/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | USB: Add functions for querying if a USB function is supported and enabled. Rename android.hardware.Usb to UsbManager and UsbObserver to UsbService Change-Id: I920a211934d993eab8ce744c1cc7b05342389286 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | | | am f7b99b32: Merge "Give system server permission to access USB. DO NOT ↵Mike Lockwood2011-02-281-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE" into gingerbread * commit 'f7b99b32ad7a4872376355acabb5984142ba5e75': Give system server permission to access USB. DO NOT MERGE
| * | | | | | | | Merge "Give system server permission to access USB. DO NOT MERGE" into ↵Mike Lockwood2011-02-281-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | gingerbread
| | * | | | | | | Give system server permission to access USB. DO NOT MERGEMike Lockwood2011-02-271-1/+1
| | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8d64bcaf2483eaa8690aef7ee2d1bb8ed9453fbe Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | | am edbd6139: Merge "Merge 1911a6f7 into gingerbread. do not merge." into ↵Xavier Ducrohet2011-02-2812-66/+67
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread * commit 'edbd6139b9d699879db2f14fb03b7b6a38bab9ea': Merge 1911a6f7 into gingerbread. do not merge.
| * | | | | | | Merge "Merge 1911a6f7 into gingerbread. do not merge." into gingerbreadXavier Ducrohet2011-02-2812-66/+67
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
generated by cgit v1.1 at 2024-09-20 13:38:24 +0000