summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am b618b2ef: am f0dbf00d: Merge "Handle OutOfMemoryError when decoding ↵Brad Fitzpatrick2011-03-301-1/+3
|\ | | | | | | | | | | | | images in ThumbnailUtils" * commit 'b618b2ef8722964730d09a86a06a85ca34df6de4': Handle OutOfMemoryError when decoding images in ThumbnailUtils
| * am f0dbf00d: Merge "Handle OutOfMemoryError when decoding images in ↵Brad Fitzpatrick2011-03-281-1/+3
| |\ | | | | | | | | | | | | | | | | | | ThumbnailUtils" * commit 'f0dbf00d37c349e8c615045876d6bc89b6bb8c54': Handle OutOfMemoryError when decoding images in ThumbnailUtils
| | * Merge "Handle OutOfMemoryError when decoding images in ThumbnailUtils"Brad Fitzpatrick2011-03-281-1/+3
| | |\
| | | * Handle OutOfMemoryError when decoding images in ThumbnailUtilsChrister Fletcher2011-03-281-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added handling of OutOfMemoryError handling to createImageThumbnail method in ThumbnailUtils.java. During mediascanner run it would run out of memory when trying to decode very large images. Now it handles this error and returns null which is handled by the media scanner. Change-Id: Ie68722dfa1cedd3c0847bf483baa40c4827ad5a8
* | | | am 7a84a60d: am 1a5a2379: Merge "Unregister callback from binder when ↵Brad Fitzpatrick2011-03-301-0/+12
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | vibration is removed" * commit '7a84a60d569ef7373fbb6418026b935d48fcd7e7': Unregister callback from binder when vibration is removed
| * | | am 1a5a2379: Merge "Unregister callback from binder when vibration is removed"Brad Fitzpatrick2011-03-281-0/+12
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '1a5a2379eb3a6cf16fb153aecbc4ac9e85d3ed42': Unregister callback from binder when vibration is removed
| | * | Merge "Unregister callback from binder when vibration is removed"Brad Fitzpatrick2011-03-281-0/+12
| | |\ \ | | | |/ | | |/|
| | | * Unregister callback from binder when vibration is removedMathias Jeppsson2011-03-241-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am cd90d1f1: am 44e4b99f: Merge "UsbService: Make USB disconnect handling ↵Mike Lockwood2011-03-291-6/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for accessory mode more robust" into honeycomb-mr1 * commit 'cd90d1f1173c344738362d24bdc637c355b75645': UsbService: Make USB disconnect handling for accessory mode more robust
| * \ \ \ am 44e4b99f: Merge "UsbService: Make USB disconnect handling for accessory ↵Mike Lockwood2011-03-291-6/+11
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mode more robust" into honeycomb-mr1 * commit '44e4b99f823a6d6131f94e67389b705d3b124c0a': UsbService: Make USB disconnect handling for accessory mode more robust
| | * \ \ \ Merge "UsbService: Make USB disconnect handling for accessory mode more ↵Mike Lockwood2011-03-291-6/+11
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | robust" into honeycomb-mr1
| | | * | | | UsbService: Make USB disconnect handling for accessory mode more robustMike Lockwood2011-03-291-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | am ad91eee2: am 9c1ef098: Update the value for the NFC shared UID.Jeff Hamilton2011-03-291-1/+1
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | * commit 'ad91eee2774e18204a14d473242efe5640b91152': Update the value for the NFC shared UID.
| * | | | | | am 9c1ef098: Update the value for the NFC shared UID.Jeff Hamilton2011-03-241-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9c1ef098837bd73044cb970545344dd03f66daa0': Update the value for the NFC shared UID.
| | * | | | | | Update the value for the NFC shared UID.Jeff Hamilton2011-03-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id25e1c9f0c074d17440838a9da7bf59619726832
* | | | | | | | am fc151b6e: Merge "Cleanup DataConnectionTracker" into honeycomb-LTEWink Saville2011-03-296-71/+47
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | * commit 'fc151b6eb4a682510f3591879037b524bc8d59d0': Cleanup DataConnectionTracker
| * | | | | | | Merge "Cleanup DataConnectionTracker" into honeycomb-LTEWink Saville2011-03-296-71/+47
| |\ \ \ \ \ \ \
| | * | | | | | | Cleanup DataConnectionTrackerWink Saville2011-03-266-71/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Promote apn members from GsmDCT to DCT. Change getState to have a apnType parameter Move abstract methods to they are together. Change-Id: I19bc5d07859c9398076ae32647d8c211d19817d1
* | | | | | | | | am b8c7c66d: am 0664a4b1: am b42e83b1: (-s ours) Merge "Import revised ↵Eric Fischer2011-03-290-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE" into honeycomb * commit 'b8c7c66de23b9b20f3992722bb5e346d8e12dd0e': Import revised translations. DO NOT MERGE
| * | | | | | | | am 0664a4b1: am b42e83b1: (-s ours) Merge "Import revised translations. DO ↵Eric Fischer2011-03-290-0/+0
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE" into honeycomb * commit '0664a4b18c3dcea82891a7389976a9d62ac7bc61': Import revised translations. DO NOT MERGE
| | * | | | | | | am b42e83b1: (-s ours) Merge "Import revised translations. DO NOT MERGE" ↵Eric Fischer2011-03-290-0/+0
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into honeycomb * commit 'b42e83b1eccfd1fa1e02cd0c30edfc06e05de995': Import revised translations. DO NOT MERGE
| | | * \ \ \ \ \ \ Merge "Import revised translations. DO NOT MERGE" into honeycombEric Fischer2011-03-2910-166/+166
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Import revised translations. DO NOT MERGEEric Fischer2011-03-2910-166/+166
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I09aefa0ca2ba1ff78574c8fbad2242d7ef63689d
* | | | | | | | | | | am c1192096: am 7171f5b7: Merge "Fix the javadoc for ↵Amith Yamasani2011-03-291-22/+26
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LocationManager.requestSingleUpdate()" into honeycomb-mr1 * commit 'c1192096627f2f9da534cb8ab7b449d6ea82123f': Fix the javadoc for LocationManager.requestSingleUpdate()
| * | | | | | | | | | am 7171f5b7: Merge "Fix the javadoc for ↵Amith Yamasani2011-03-291-22/+26
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LocationManager.requestSingleUpdate()" into honeycomb-mr1 * commit '7171f5b7d16e9a0c861cc249188864385877077f': Fix the javadoc for LocationManager.requestSingleUpdate()
| | * | | | | | | | | Merge "Fix the javadoc for LocationManager.requestSingleUpdate()" into ↵Amith Yamasani2011-03-291-22/+26
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-mr1
| | | * | | | | | | | | Fix the javadoc for LocationManager.requestSingleUpdate()Amith Yamasani2011-03-291-22/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was saying the same thing as requestLocationUpdates(), but it only provides a single update. Change-Id: I0a0f612104a946b7db96928505bb95673377a335
* | | | | | | | | | | | am 35137d66: (-s ours) am 6a19759c: Do Not Merge: Cherry-pick change ↵Bart Sears2011-03-290-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I7667f9b8 to GingerBread * commit '35137d669681a0d6a22316c035ea7c8edc8fdc33': Do Not Merge: Cherry-pick change I7667f9b8 to GingerBread
| * | | | | | | | | | | am 6a19759c: Do Not Merge: Cherry-pick change I7667f9b8 to GingerBreadBart Sears2011-03-249-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6a19759c0fae744e80c032ca3c23932e73e6d9d9': Do Not Merge: Cherry-pick change I7667f9b8 to GingerBread
| | * | | | | | | | | | Do Not Merge: Cherry-pick change I7667f9b8 to GingerBreadBart Sears2011-03-239-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Droid Fonts DroidSans-Bold.ttf DroidSans.ttf DroidSansMono.ttf DroidSerif-Bold.ttf DroidSerif-BoldItalic.ttf DroidSerif-Italic.ttf DroidSerif-Regular.ttf - Fix the Tcedilla glyphs DroidSansFallback - Add Dingbat Symbols - Add Currency Symbols - Add International Phonetic Alphabet (IPA) - Add U+02BB Modifier letter turned comma - Add U+2011 Non-breaking hyphen DroidSansArabic.ttf - Updated Arabic font - Added support for initial and medial forms of Persian (Farsi) yeh (glyphs U+FBFE and U+FBFF) Bug: 4167128 Change-Id: Iec3e5b20c6dd54ff7cc5bef51dd5a05179d8d5a8
* | | | | | | | | | | | am 772f5bb1: (-s ours) am f440831d: DO NOT MERGEHuahui Wu2011-03-290-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '772f5bb1894710b0f0068d4f34e85ce38becc4b6': DO NOT MERGE
| * | | | | | | | | | | am f440831d: DO NOT MERGEHuahui Wu2011-03-242-2/+24
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f440831d76817e837164ca18c7705e81d2391f87': DO NOT MERGE
| | * | | | | | | | | | DO NOT MERGEHuahui Wu2011-03-232-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/4088884 Backport "Remove content:// protocol handler in web browser" to Gingerbread It's a manual cherrypick of https://android-git.corp.google.com/g/#change,87278 since a lot has been changed in bettween. Change-Id: Ic8e3a419571f535bf983f32cd02181ca66d19319
* | | | | | | | | | | | am bc2489e4: am f5cedbe5: Merge "Import revised translations. DO NOT MERGE" ↵Eric Fischer2011-03-2942-329/+169
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into honeycomb-mr1 * commit 'bc2489e4c55ca7ae06afe1f3449135aa48359165': Import revised translations. DO NOT MERGE
| * | | | | | | | | | | am f5cedbe5: Merge "Import revised translations. DO NOT MERGE" into ↵Eric Fischer2011-03-2942-329/+169
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-mr1 * commit 'f5cedbe508c46c27a6ce1554aed919bfbfc6fc4e': Import revised translations. DO NOT MERGE
| | * | | | | | | | | | Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1Eric Fischer2011-03-2942-329/+169
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | Import revised translations. DO NOT MERGEEric Fischer2011-03-2942-329/+169
| | | | |_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I962bb9917aa3f3d4b911c1ad7fdfbcda94afa0c7
* | | | | | | | | | | am 6f67e7bf: am 2e383bc6: Merge "Making it possible to call SIP calls with ↵Brad Fitzpatrick2011-03-292-4/+9
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | special allowed chars." * commit '6f67e7bf831147257e078dd72a22f2e43e009122': Making it possible to call SIP calls with special allowed chars.
| * | | | | | | | | | am 2e383bc6: Merge "Making it possible to call SIP calls with special ↵Brad Fitzpatrick2011-03-232-4/+9
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | allowed chars." * commit '2e383bc6445b37d3b37fbc5b7620cd4716c5692c': Making it possible to call SIP calls with special allowed chars.
| | * | | | | | | | | Merge "Making it possible to call SIP calls with special allowed chars."Brad Fitzpatrick2011-03-232-4/+9
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Making it possible to call SIP calls with special allowed chars.Magnus Strandberg2011-03-222-4/+9
| | | | |_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since String.replaceFirst uses regex and since SIP user names are allowed to include regex charaters such as '+', the code must fist convert the string to a literal pattern String before using replaceFirst method. Change-Id: I25eac852bd620724ca1c5b2befc023af9dae3c1a
* | | | | | | | | | | am a4206029: am 5d5a0ca5: Merge "Fixing the wrong link in YuvImage JavaDoc."Brad Fitzpatrick2011-03-291-3/+3
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a4206029cbb8f6c02c47db52f84b7d52e154e35a': Fixing the wrong link in YuvImage JavaDoc.
| * | | | | | | | | | am 5d5a0ca5: Merge "Fixing the wrong link in YuvImage JavaDoc."Brad Fitzpatrick2011-03-231-3/+3
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5d5a0ca5ebc3f4f60b5ad2afc161b3b8b33953e7': Fixing the wrong link in YuvImage JavaDoc.
| | * | | | | | | | | Merge "Fixing the wrong link in YuvImage JavaDoc."Brad Fitzpatrick2011-03-231-3/+3
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | Fixing the wrong link in YuvImage JavaDoc.Keiji Ariyama2011-02-051-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie6334e16424e59b75274ef265f10d26ba484316a
* | | | | | | | | | | am 0b0dbea0: am e4f33617: am faede250: IAB doc update for final launchBill Gruber2011-03-2911-123/+28
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0b0dbea0bc38087dfa3e82b91c0381154bb8bdfd': IAB doc update for final launch
| * | | | | | | | | | am e4f33617: am faede250: IAB doc update for final launchBill Gruber2011-03-2911-123/+28
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e4f33617c3654bdcb246ee8f74e67d1828cd42c9': IAB doc update for final launch
| | * | | | | | | | | am faede250: IAB doc update for final launchBill Gruber2011-03-2811-123/+28
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | / / / | | | | |_|_|_|/ / / | | | |/| | | | | | * commit 'faede250301e291a060d094c73a25a351f96cbb5': IAB doc update for final launch
| | | * | | | | | | IAB doc update for final launchBill Gruber2011-03-2811-123/+28
| | | | |_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5173422eb65f4effc61162c2b172750dee0a6a2c
* | | | | | | | | am 59d1b26a: Merge "DataConnectionTracker cleanup when disposed." into ↵Wink Saville2011-03-283-2/+10
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-LTE * commit '59d1b26a6a4b9b2de829d62af2179f57deb79391': DataConnectionTracker cleanup when disposed.
generated by cgit v1.1 at 2025-02-04 10:42:02 +0000