summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix a deadlock caused by the AudioPlayer notifying the observer that the ↵Andreas Huber2010-02-034-52/+73
| | | | | | stream had ended at the same time the observer was shutting down the AudioPlayer. related-to-bug: 2414536
* Merge "undo "move HttpDateTime from android.webkit to android-common jar""Doug Zongker2010-02-033-4/+224
|\
| * undo "move HttpDateTime from android.webkit to android-common jar"Doug Zongker2010-02-033-4/+224
| | | | | | | | | | | | | | | | | | This restores this class to android.webkit, but leaves a copy in android-common while I figure out how to move it correctly. This reverts commit 7ad12a5f44253dc535f9a25ceb029579b40c43b1. Change-Id: I1d0a3efe34764058b979c6987e6e774f64d02b8c
* | Merge "Copy ic_menu_search.png to ic_search_category_default.png"Bjorn Bringert2010-02-032-0/+0
|\ \
| * | Copy ic_menu_search.png to ic_search_category_default.pngBjorn Bringert2010-02-032-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For some reason both these icons are exposed. Some apps use ic_search_category_default.png for their search menu item, and some use ic_menu_search.png. To make them look the same, I copied ic_menu_search to ic_search_category_default. Fixes http://b/issue?id=2373762 Change-Id: I045efaac84ed9507c4c0c9d6996f1bedb50d753f
* | | Merge "Honor '+' in phone export in vCard."Daisuke Miyakawa2010-02-031-1/+3
|\ \ \
| * | | Honor '+' in phone export in vCard.Daisuke Miyakawa2010-02-031-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Currently no test because of temporal reason. I'll do in the near future... Bug: 2417138
* | | | am b299f802: am 9f4cfc3a: Merge "Screenshots for sample syncadapter." into ↵Megha Joshi2010-02-033-0/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eclair Merge commit 'b299f802b2dea19b003a6724d53ecff1b763bab0' * commit 'b299f802b2dea19b003a6724d53ecff1b763bab0': Screenshots for sample syncadapter.
| * \ \ \ am 9f4cfc3a: Merge "Screenshots for sample syncadapter." into eclairMegha Joshi2010-02-033-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '9f4cfc3afcdf9f7be096b3243bfc15b9346b8434' into eclair-plus-aosp * commit '9f4cfc3afcdf9f7be096b3243bfc15b9346b8434': Screenshots for sample syncadapter.
| | * \ \ \ Merge "Screenshots for sample syncadapter." into eclairMegha Joshi2010-02-033-0/+0
| | |\ \ \ \
| | | * | | | Screenshots for sample syncadapter.Megha Joshi2010-02-033-0/+0
| | | | | | |
* | | | | | | fix [2133133] Software OpenGL ES Lighting is buggy (GL Gears washed out bug)Mathias Agopian2010-02-034-28/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A typo caused GL_AMBIENT_AND_DIFFUSE to only set the the ambient color. Fix another typo which caused the viewer position to be wrong for specular highlights. Switch back to eye-space lighting, since there are still some issues with some demos (San Angeles in particular).
* | | | | | | Merge "Remove "StringTest.java"."Elliott Hughes2010-02-031-149/+0
|\ \ \ \ \ \ \
| * | | | | | | Remove "StringTest.java".Elliott Hughes2010-02-031-149/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This only tests stuff that's already better tested in dalvik/libcore, plus private ICU API (RuleBasedNumberFormat) we'd like to remove, and that this is the only caller of.
* | | | | | | | Merge "BatteryStatsImpl: initalize audio timer"Mike Chan2010-02-031-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | BatteryStatsImpl: initalize audio timerMike Chan2010-02-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Mike Chan <mike@android.com>
* | | | | | | | | Fixed a regression in View.cancelLongPressAdam Powell2010-02-031-0/+7
| | | | | | | | |
* | | | | | | | | Merge "move HttpDateTime from android.webkit to android-common jar"Doug Zongker2010-02-033-1/+5
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | move HttpDateTime from android.webkit to android-common jarDoug Zongker2010-02-033-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some to-be-unbundled classes want to use HttpDateTime as well. Change-Id: I40a001970682f6fbd4d9cd3546bd3f63ebfbe89b
* | | | | | | | | Merge "Javadoc fixes to ScaleGestureDetector for SDK builds"Adam Powell2010-02-031-6/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Javadoc fixes to ScaleGestureDetector for SDK buildsAdam Powell2010-02-031-6/+6
| | | | | | | | | |
* | | | | | | | | | Merge "Fix fastscroll thumb"Marco Nelissen2010-02-031-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix fastscroll thumbMarco Nelissen2010-02-031-1/+1
| | | | | | | | | | |
* | | | | | | | | | | Merge "use device serial number to seed RNG for generating ANDROID_ID"Doug Zongker2010-02-031-2/+11
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | use device serial number to seed RNG for generating ANDROID_IDDoug Zongker2010-02-031-2/+11
| | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1bcc55f1309cb908803bc42084846a046041eda6
* | | | | | | | | | | Merge "Add a "dalvik.vm.gc.overwritefree" property. When set to "true", the ↵Barry Hayes2010-02-031-0/+9
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VM will be given the "-Xgc:overwritefree" flag, and the GC will clobber the memory of freed objects."
| * | | | | | | | | | | Add a "dalvik.vm.gc.overwritefree" property. When set to "true", theBarry Hayes2010-02-031-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VM will be given the "-Xgc:overwritefree" flag, and the GC will clobber the memory of freed objects.
* | | | | | | | | | | | Merge "Make the fastscroll thumb tell the parent to not intercept touch ↵Marco Nelissen2010-02-031-1/+10
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | / / / / / / / / / | | |/ / / / / / / / / | |/| | | | | | | | | events, to keep the list from moving sideways in a "workspace" environment. Fixes one of the issues listed in bug 2374212"
| * | | | | | | | | | Make the fastscroll thumb tell the parent to not intercept touch events,Marco Nelissen2010-02-031-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to keep the list from moving sideways in a "workspace" environment. Fixes one of the issues listed in bug 2374212
* | | | | | | | | | | Merge "expose bootloader & radio versions, hardware string in API"Doug Zongker2010-02-032-4/+34
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | expose bootloader & radio versions, hardware string in APIDoug Zongker2010-02-032-4/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds three new device-version-related strings to android.os.Build. Change-Id: I832f87f26e50a649249c58037f563426f3bfc4bf
* | | | | | | | | | | | Merge "Add missing contentDescription to focusable controls."Romain Guy2010-02-032-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add missing contentDescription to focusable controls.Dominic Mazzoni2010-02-032-0/+7
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge "AudioPlayer didn't properly account for the latency when calculating ↵Andreas Huber2010-02-031-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | the current media time."
| * | | | | | | | | | | AudioPlayer didn't properly account for the latency when calculating the ↵Andreas Huber2010-02-031-2/+7
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | current media time. related-to-bug: 2414900
* | | | | | | | | | | Merge "Apps on sdcard: Add new broadcasts"Suchi Amalapurapu2010-02-0315-262/+793
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Apps on sdcard: Add new broadcastsSuchi Amalapurapu2010-02-0215-262/+793
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new broadcasts ACTION_MEDIA_RESOURCES_AVAILABLE and ACTION_MEDIA_RESOURCES_UNAVAILABLE that get broadcast by PackageManagerService when sdcard gets mounted/unmounted by MountService so that packages on sdcard get recognized by various system services as being installed/available or removed/unavailable by the system. The broadcasts are sent before the actual package cleanup which includes mounting/unmounting the packages and we force a gc right after so that any lingering file references to resources on sdcard get released.
* | | | | | | | | | | | Pass touch event time from Java to WebKitGrace Kloba2010-02-032-2/+6
| |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge from https://android-git.corp.google.com/g/#change,39355
* | | | | | | | | | | Merge "Add support for sending touch events in DRT."Ben Murdoch2010-02-036-8/+294
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Add support for sending touch events in DRT.Ben Murdoch2010-02-036-8/+294
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As part of this, make it possible for DRT to configure the timeout threshold between sending touch events to WebCore as the Layout Tests only synthesize single events, not a stream. Because of this, they often get dropped by the WebView for coming too quickly. Skip the multi touch test as we don't support multi touch in the Browser. Change-Id: I7b9830f43181fea33206825b49ef2e294269b4dd
* | | | | | | | | | Merge "Rebuild a cleaner certificates chain before validating it."Leon Clarke2010-02-031-152/+62
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Rebuild a cleaner certificates chain before validating it.Huahui Wu2010-02-021-152/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change cleans the server certificates: 1. Use the end-entity certificate as found in the chain received from the server as the end-entity cert for the newly built chain. 2. Look at the last cert in the newly built chain, specifically it's "issuer" field. If there's a cert in the chain as received with this as the "subject", and this cert hasn't yet been moved into the newly built chain, move it there (as the new last cert). Repeat this step 2 until you can't continue (because there's no matching previously unused cert left). 3. If the last certificate in the new chain has expired (and it's not the end-entity cert), remember this fact, and remove it (so that we can try if we can validating the chain for a different root). If in this case it turns out that we still can't validate the chain, it's probably the cert expiry error that should be displayed. This CL also cleans the redundant error detection code and reduces the error messages to two types, which are the only two make differences to the user: a. SSL_IDMISMATCH for name mismatch, b. SSL_UNTRUSTED for other reasons.
* | | | | | | | | | Revert "am 3db1ebaf: am 4ed2b1c3: Pass touch event time from Java to ↵Ben Murdoch2010-02-032-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebKit". The corresponding change to external/webkit creates a merge conflict in master. Revert the frameworks/base part of the change so we can "do not merge" the external/webkit change and get the build working again. We can then later resolve the conflict in external/webkit in master directly. This reverts commit 9ecd9437ed57bedfa2a7626430be03f4924f6b42, reversing changes made to 019fe73ddbf52edd1819e1d85a0b242ebccc7fc3. Change-Id: Id1404fb056b033ebd60529dd326ec9a3c32f94b0
* | | | | | | | | | am 3db1ebaf: am 4ed2b1c3: Pass touch event time from Java to WebKitGrace Kloba2010-02-022-2/+6
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '3db1ebaf1cc2a097845f217626e31d69e156b73d' * commit '3db1ebaf1cc2a097845f217626e31d69e156b73d': Pass touch event time from Java to WebKit
| * \ \ \ \ \ \ \ \ \ am 4ed2b1c3: Pass touch event time from Java to WebKitGrace Kloba2010-02-022-2/+6
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '4ed2b1c34b2dd0e2bd2f403a6f3de0bdbf473b98' into eclair-mr2-plus-aosp * commit '4ed2b1c34b2dd0e2bd2f403a6f3de0bdbf473b98': Pass touch event time from Java to WebKit
| | * | | | | | | | | | Pass touch event time from Java to WebKitGrace Kloba2010-02-022-2/+6
| | | | | | | | | | | |
* | | | | | | | | | | | Fix ETC1 texture decoding.Jack Palevich2010-02-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | etc1_decode_image requires the stride argument to be in bytes, but the surface->stride field is in pixels. Convert by multiplying by pixel size.
* | | | | | | | | | | | Merge "implement [2396050] Add ETC1 texture support to AGL"Mathias Agopian2010-02-024-7/+46
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | implement [2396050] Add ETC1 texture support to AGLMathias Agopian2010-02-024-7/+46
| | | | | | | | | | | | |
* | | | | | | | | | | | | Add GPS_TIMESTAMP and GPS_DATESTAMP tag to ExifInterface.Ray Chen2010-02-031-0/+22
| | | | | | | | | | | | |
generated by cgit v1.1 at 2024-09-19 18:38:46 +0000