summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* Merge "b/2293263 Finished removing busyBits references."Erik Pasternak2010-01-081-74/+0
|\
| * b/2293263 Finished removing busyBits references.Erik2010-01-071-74/+0
| | | | | | | | | | Removed the rest of the busyBit functionality. Along with other changes all busyBits uses should now be removed.
* | Unhide WebView#emulateShiftHeld() so that gmail can do select-to-copyEvan Millar2010-01-081-3/+0
| |
* | Merge "Update with latest translations."Eric Fischer2010-01-0820-2901/+2146
|\ \
| * | Update with latest translations.Eric Fischer2010-01-0720-2901/+2146
| | |
* | | Merge "Fix a bug where the usage for an origin shows up as 0 in Website ↵Andrei Popescu2010-01-081-2/+2
|\ \ \ | | | | | | | | | | | | Settings when the origin uses app cache but not database."
| * | | Fix a bug where the usage for an origin shows up as 0 in Website Settings ↵Andrei Popescu2010-01-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | when the origin uses app cache but not database.
* | | | Merge "Deprecate onTooManyRedirects."Patrick Scott2010-01-082-26/+5
|\ \ \ \
| * | | | Deprecate onTooManyRedirects.Patrick Scott2010-01-082-26/+5
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | The method was added a long time ago but has never been called. Rather than spend time implementing and testing this feature, deprecate the function. Bug: 2257857
* | | | Merge "when finalizing SQLiteCursor, close it but don't throw exceptions."Vasu Nori2010-01-081-5/+7
|\ \ \ \
| * | | | when finalizing SQLiteCursor, close it but don't throw exceptions.Vasu Nori2010-01-071-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | currently, an exception is thrown if SQLiteCursor object is being finalized before the cursor is closed. instead of an exception, simply log an error message. some android team members look at the exception and think it is catastrophic.
* | | | | Merge "remove Settings.Gservices"Doug Zongker2010-01-081-900/+72
|\ \ \ \ \
| * | | | | remove Settings.GservicesDoug Zongker2010-01-071-900/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the last few keys to secure settings, and delete the Gservices table. Change-Id: Ie3ba45aa8c1f220824aa027c547cb82884452eb5
* | | | | | Merge "Environment: Catch *all* exceptions from MountService"San Mehat2010-01-081-1/+1
|\ \ \ \ \ \
| * | | | | | Environment: Catch *all* exceptions from MountServiceSan Mehat2010-01-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: San Mehat <san@google.com>
* | | | | | | am 4e9a9d8e: am c89b13b9: Use Calendar.add() instead of Calendar.roll()Leon Scroggins2010-01-081-12/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '4e9a9d8ea8a31578b936b17f66177f4c1b18cddb' * commit '4e9a9d8ea8a31578b936b17f66177f4c1b18cddb': Use Calendar.add() instead of Calendar.roll()
| * \ \ \ \ \ \ am c89b13b9: Use Calendar.add() instead of Calendar.roll()Leon Scroggins2010-01-081-12/+16
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'c89b13b962c6634db536e563a42d058702ce045b' into eclair-mr2-plus-aosp * commit 'c89b13b962c6634db536e563a42d058702ce045b': Use Calendar.add() instead of Calendar.roll()
| | * | | | | | | Use Calendar.add() instead of Calendar.roll()Leon Scroggins2010-01-081-12/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calendar.roll() breaks the year at the beginning of the year, so use add() instead, which changes larger fields. Also, only use 4 bins, since the last bin's boundary is not relevant. Lastly, no need to return Calendar in beginningOfDay. Fixes http://b/issue?id=2361382
* | | | | | | | | am 2110bb02: am affa5d2c: remove unused jni interfacesCary Clark2010-01-081-8/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | / / / | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | Merge commit '2110bb024eafe4578bb9acace9f1ad4ae55ff9fd' * commit '2110bb024eafe4578bb9acace9f1ad4ae55ff9fd': remove unused jni interfaces
| * | | | | | | am affa5d2c: remove unused jni interfacesCary Clark2010-01-071-8/+2
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'affa5d2c0f7c2ade43ded5ff9a7952b269183117' into eclair-mr2-plus-aosp * commit 'affa5d2c0f7c2ade43ded5ff9a7952b269183117': remove unused jni interfaces
| | * | | | | | remove unused jni interfacesCary Clark2010-01-071-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also make package interfaces unused outside of WebView.java private. companion change in external/webkit
* | | | | | | | Unhide intent extra constants for Camera.Chih-Chung Chang2010-01-081-4/+0
| | | | | | | |
* | | | | | | | Merge "Bumper un-@hide (un-@pending actually) of previously reviewed APIs:"Dan Egnor2010-01-074-8/+2
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Bumper un-@hide (un-@pending actually) of previously reviewed APIs:Dan Egnor2010-01-074-8/+2
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - new Log methods for reportable conditions - EventLog publication, EventLogTags deprecation - a new stackTrace field in ProcessErrorStateInfo
* | | | | | | remove GoogleWebContentHelper classDoug Zongker2010-01-071-281/+0
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This shouldn't have been in frameworks/base; migrated to vendor/google. Change-Id: Ia7a4748f9acf9d0a1d059496b75d0a8b827bc294
* | | | | | change remaining frameworks/base Gservices to Secure settingsDoug Zongker2010-01-072-119/+135
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I61bdb05a2526523700c2833154d5a4133881ef10
* | | | | | move some system services from gservices to secure settingsDoug Zongker2010-01-071-85/+102
| |_|_|_|/ |/| | | | | | | | | | | | | | Change-Id: Ie2dfb99a2b42b2cc9310b858c044d8684e3493fa
* | | | | Merge "b/2358627 and b/2293263 Fixed eventDay bugs."Erik Pasternak2010-01-071-1/+2
|\ \ \ \ \
| * | | | | b/2358627 and b/2293263 Fixed eventDay bugs.Erik2010-01-071-1/+2
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | Changed query so that all days an event occurs on can be marked. Also fixes index out of bounds error.
* | | | | Add a string for second-ABI system property to android.os.Build.Ficus Kirkpatrick2010-01-071-0/+3
| | | | |
* | | | | am 5f6002ec: am d71c2aa1: Merge "SDK doc change: add "Optimizing ↵Dirk Dougherty2010-01-071-22/+22
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Judiciously" excerpt to best practices. Clean up blockquote usage in other files." into eclair Merge commit '5f6002ec5f52ed164b591cf4b267fe771a81731f' * commit '5f6002ec5f52ed164b591cf4b267fe771a81731f': SDK doc change: add "Optimizing Judiciously" excerpt to best practices. Clean up blockquote usage in other files.
| * \ \ \ \ am d71c2aa1: Merge "SDK doc change: add "Optimizing Judiciously" excerpt to ↵Dirk Dougherty2010-01-071-22/+22
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | best practices. Clean up blockquote usage in other files." into eclair Merge commit 'd71c2aa1a33a456b631ae539fe57f8eb5615fcd5' into eclair-plus-aosp * commit 'd71c2aa1a33a456b631ae539fe57f8eb5615fcd5': SDK doc change: add "Optimizing Judiciously" excerpt to best practices. Clean up blockquote usage in other files.
| | * \ \ \ \ Merge "SDK doc change: add "Optimizing Judiciously" excerpt to best ↵Dirk Dougherty2010-01-071-22/+22
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | practices. Clean up blockquote usage in other files." into eclair
| | | * | | | | SDK doc change: add "Optimizing Judiciously" excerpt to best practices. ↵Dirk Dougherty2010-01-071-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up blockquote usage in other files. Bug: 2160782 Change-Id: I537194ecddc53d4f0e8456ce958ae8db6f521593
* | | | | | | | ShutdownThread: Shutdown MountService before lowlevel shutdownSan Mehat2010-01-071-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: San Mehat <san@google.com>
* | | | | | | | Merge "MountService: Add an ACTION_SHUTDOWN handler and export a method for ↵San Mehat2010-01-071-0/+6
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | external shutdown"
| * | | | | | | MountService: Add an ACTION_SHUTDOWN handler and export a method for ↵San Mehat2010-01-071-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | external shutdown Signed-off-by: San Mehat <san@google.com>
* | | | | | | | Merge "Remove old EventLog tests from here, they will be replaced by a ↵Dan Egnor2010-01-072-3/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | (better) EventLog test in CTS."
| * | | | | | | | Remove old EventLog tests from here, they will be replaced by aDan Egnor2010-01-072-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (better) EventLog test in CTS. Fix some minor errors in the handling of too-large event log values.
* | | | | | | | | Merge "move Watchdog's settings from Gservices to Secure"Doug Zongker2010-01-071-111/+127
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | move Watchdog's settings from Gservices to SecureDoug Zongker2010-01-061-111/+127
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iac1146dafa12f9247874514c9aeefa5f8f83933d
* | | | | | | | | am 2790b20c: am 0b6c6f2c: Merge "Fix media option settings for A2DP." into ↵Jaikumar Ganesh2010-01-071-1/+2
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eclair Merge commit '2790b20c537b33dbf366436f6d27776148ded490' * commit '2790b20c537b33dbf366436f6d27776148ded490': Fix media option settings for A2DP.
| * | | | | | | | am 0b6c6f2c: Merge "Fix media option settings for A2DP." into eclairJaikumar Ganesh2010-01-061-1/+2
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '0b6c6f2cbc7490c952141cee6a662ddcdb0bae5b' into eclair-plus-aosp * commit '0b6c6f2cbc7490c952141cee6a662ddcdb0bae5b': Fix media option settings for A2DP.
| | * | | | | | | Fix media option settings for A2DP.Jaikumar Ganesh2010-01-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Incoming connections move the A2DP state to Connecting before getting authorized, which messes up the priorities. Dr No: Eastham Bug: 2358414
* | | | | | | | | am 80410b55: am 42c98ada: Still use ro.monkeyYing Wang2010-01-071-2/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | / / / / | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | Merge commit '80410b55f1eccf345fb6a01ca9a277935ac4098f' * commit '80410b55f1eccf345fb6a01ca9a277935ac4098f': Still use ro.monkey
| * | | | | | | am 42c98ada: Still use ro.monkeyYing Wang2010-01-061-2/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '42c98ada113ae5b7c72ecb6d0de721ec1d0d3534' into eclair-plus-aosp * commit '42c98ada113ae5b7c72ecb6d0de721ec1d0d3534': Still use ro.monkey
| | * | | | | | Still use ro.monkeyYing Wang2010-01-061-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://b/issue?id=1681101
* | | | | | | | am bd6029fc: am 3a503399: Request <label> info only when accessing a textfield.Leon Scroggins2010-01-073-9/+51
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'bd6029fc5171e1094a00cdecb3f33aae6fe69c9f' * commit 'bd6029fc5171e1094a00cdecb3f33aae6fe69c9f': Request <label> info only when accessing a textfield.
| * | | | | | | am 3a503399: Request <label> info only when accessing a textfield.Leon Scroggins2010-01-073-9/+51
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '3a5033996e9df21abbd5b296d817c2acaedcb0f9' into eclair-mr2-plus-aosp * commit '3a5033996e9df21abbd5b296d817c2acaedcb0f9': Request <label> info only when accessing a textfield.
| | * | | | | | Request <label> info only when accessing a textfield.Leon Scroggins2010-01-073-9/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we were storing the label info each time we build the navigation cache. Requires a change to external/webkit.