Charles Chen
714834d757
Merge "Enabling multiple apps to use different speech synthesis engines and not interfere with one another."
2010-01-08 15:26:57 -08:00
Charles Chen
60dd360640
Enabling multiple apps to use different speech synthesis engines and not
...
interfere with one another.
2010-01-08 15:06:57 -08:00
San Mehat
0a02894202
Merge "MountService: Add new Settings for UMS prompting and notification behavior"
2010-01-08 15:05:57 -08:00
San Mehat
ad5a748ea7
Merge "Settings: Add settings for MountService prefs and bump DB version to 46"
2010-01-08 15:03:43 -08:00
Mike Reed
b2924736d7
explicitly initialize static final boolean to fix build
2010-01-08 17:34:58 -05:00
Mike Reed
1df26b1ed2
Merge "optional flag to enable tracker debugging"
2010-01-08 13:34:54 -08:00
Mike Reed
fdc5424b1c
optional flag to enable tracker debugging
2010-01-08 16:13:28 -05:00
Tom O'Neill
046dd0111c
Merge "ContentResolver.query() includes performance considerations"
2010-01-08 13:04:56 -08:00
San Mehat
1f6301e1ff
MountService: Add new Settings for UMS prompting and notification behavior
...
Signed-off-by: San Mehat <san@google.com>
2010-01-08 12:56:33 -08:00
San Mehat
87734d3bc1
Settings: Add settings for MountService prefs and bump DB version to 46
...
Adds 4 new Settings:
Secure.MOUNT_PLAY_NOTIFICATION_SND - Play notification sound on events
Secure.MOUNT_UMS_AUTOSTART - Auto-start UMS when host detected
Secure.MOUNT_UMS_PROMPT - Show notification when host detected
Secure.MOUNT_UMS_NOTIFY_ENABLED - Show notification while UMS enabled
These settings are also added to the Settings backup list
Signed-off-by: San Mehat <san@google.com>
2010-01-08 12:55:22 -08:00
Tom O'Neill
0ba1cb06c6
ContentResolver.query() includes performance considerations
...
Mention the desirability of using "?"-substitution in the where clause,
and reemphasize the importance of using an explicit projection.
Change-Id: Iaa489d50db409f34e78bcd55253e5a4e53445cf2
2010-01-08 12:53:50 -08:00
Joe Onorato
f5d95cbc1a
less log spew
2010-01-08 15:46:24 -05:00
Erik Pasternak
660cc3461a
Merge "b/2293263 Finished removing busyBits references."
2010-01-08 10:45:35 -08:00
Evan Millar
431f5fd9e8
Unhide WebView#emulateShiftHeld() so that gmail can do select-to-copy
2010-01-08 10:17:02 -08:00
Eric Fischer
698893fc90
Merge "Update with latest translations."
2010-01-08 10:00:58 -08:00
Andrei Popescu
b816377fed
Merge "Fix a bug where the usage for an origin shows up as 0 in Website Settings when the origin uses app cache but not database."
2010-01-08 09:49:31 -08:00
Patrick Scott
29eadcf376
Merge "Deprecate onTooManyRedirects."
2010-01-08 09:23:44 -08:00
Vasu Nori
02a018f0b5
Merge "when finalizing SQLiteCursor, close it but don't throw exceptions."
2010-01-08 09:21:31 -08:00
Andrei Popescu
9840970413
Fix a bug where the usage for an origin shows up as 0 in Website Settings when the origin
...
uses app cache but not database.
2010-01-08 16:41:23 +00:00
Doug Zongker
c2a5d96b5d
Merge "remove Settings.Gservices"
2010-01-08 08:41:17 -08:00
San Mehat
595ae28dab
Merge "Environment: Catch *all* exceptions from MountService"
2010-01-08 07:19:56 -08:00
Patrick Scott
6a5b0ecae5
Deprecate onTooManyRedirects.
...
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
2010-01-08 10:16:33 -05:00
Leon Scroggins
0d05539533
am 4e9a9d8e: am c89b13b9: Use Calendar.add() instead of Calendar.roll()
...
Merge commit '4e9a9d8ea8a31578b936b17f66177f4c1b18cddb'
* commit '4e9a9d8ea8a31578b936b17f66177f4c1b18cddb':
Use Calendar.add() instead of Calendar.roll()
2010-01-08 06:48:21 -08:00
Cary Clark
b0470f67a1
am 2110bb02: am affa5d2c: remove unused jni interfaces
...
Merge commit '2110bb024eafe4578bb9acace9f1ad4ae55ff9fd'
* commit '2110bb024eafe4578bb9acace9f1ad4ae55ff9fd':
remove unused jni interfaces
2010-01-08 06:48:08 -08:00
Leon Scroggins
4e9a9d8ea8
am c89b13b9: Use Calendar.add() instead of Calendar.roll()
...
Merge commit 'c89b13b962c6634db536e563a42d058702ce045b' into eclair-mr2-plus-aosp
* commit 'c89b13b962c6634db536e563a42d058702ce045b':
Use Calendar.add() instead of Calendar.roll()
2010-01-08 06:43:36 -08:00
Leon Scroggins
c89b13b962
Use Calendar.add() instead of Calendar.roll()
...
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
2010-01-08 09:18:37 -05:00
San Mehat
a6a72814e0
Environment: Catch *all* exceptions from MountService
...
Signed-off-by: San Mehat <san@google.com>
2010-01-07 22:39:53 -08:00
Chih-Chung Chang
624d39dd81
Unhide intent extra constants for Camera.
2010-01-08 12:31:16 +08:00
Dan Egnor
b0ef1bcfa1
Merge "Bumper un-@hide (un-@pending actually) of previously reviewed APIs:"
2010-01-07 19:16:34 -08:00
Dan Egnor
6e70912bd5
Bumper un-@hide (un-@pending actually) of previously reviewed APIs:
...
- new Log methods for reportable conditions
- EventLog publication, EventLogTags deprecation
- a new stackTrace field in ProcessErrorStateInfo
2010-01-07 19:10:43 -08:00
Doug Zongker
aed8f8eb14
remove Settings.Gservices
...
Move the last few keys to secure settings, and delete the Gservices
table.
Change-Id: Ie3ba45aa8c1f220824aa027c547cb82884452eb5
2010-01-07 18:24:48 -08:00
Erik
b85513ba9c
b/2293263 Finished removing busyBits references.
...
Removed the rest of the busyBit functionality. Along with other changes all busyBits
uses should now be removed.
2010-01-07 16:52:29 -08:00
Eric Fischer
d22c49a2d5
Update with latest translations.
2010-01-07 15:55:17 -08:00
Doug Zongker
c34705bc35
remove GoogleWebContentHelper class
...
This shouldn't have been in frameworks/base; migrated to vendor/google.
Change-Id: Ia7a4748f9acf9d0a1d059496b75d0a8b827bc294
2010-01-07 15:49:40 -08:00
Vasu Nori
42960e8ddf
when finalizing SQLiteCursor, close it but don't throw exceptions.
...
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.
2010-01-07 15:47:13 -08:00
Doug Zongker
edc5189c33
change remaining frameworks/base Gservices to Secure settings
...
Change-Id: I61bdb05a2526523700c2833154d5a4133881ef10
2010-01-07 15:00:37 -08:00
Doug Zongker
43866e0c48
move some system services from gservices to secure settings
...
Change-Id: Ie2dfb99a2b42b2cc9310b858c044d8684e3493fa
2010-01-07 14:20:39 -08:00
Erik Pasternak
6414970ac7
Merge "b/2358627 and b/2293263 Fixed eventDay bugs."
2010-01-07 13:52:08 -08:00
Ficus Kirkpatrick
fa9cafa074
Add a string for second-ABI system property to android.os.Build.
2010-01-07 12:57:42 -08:00
Dirk Dougherty
1c819a5e3e
am 5f6002ec: am d71c2aa1: Merge "SDK doc change: add "Optimizing 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.
2010-01-07 12:37:15 -08:00
Dirk Dougherty
5f6002ec5f
am d71c2aa1: Merge "SDK doc change: add "Optimizing Judiciously" excerpt to 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.
2010-01-07 12:33:48 -08:00
Dirk Dougherty
d71c2aa1a3
Merge "SDK doc change: add "Optimizing Judiciously" excerpt to best practices. Clean up blockquote usage in other files." into eclair
2010-01-07 12:30:14 -08:00
Dirk Dougherty
4e7db25687
SDK doc change: add "Optimizing Judiciously" excerpt to best practices. Clean up blockquote usage in other files.
...
Bug: 2160782
Change-Id: I537194ecddc53d4f0e8456ce958ae8db6f521593
2010-01-07 12:05:01 -08:00
Erik
bd8e2e20a9
b/2358627 and b/2293263 Fixed eventDay bugs.
...
Changed query so that all days an event occurs on can be marked. Also
fixes index out of bounds error.
2010-01-07 11:56:46 -08:00
San Mehat
9f7f7cad0b
ShutdownThread: Shutdown MountService before lowlevel shutdown
...
Signed-off-by: San Mehat <san@google.com>
2010-01-07 11:36:22 -08:00
San Mehat
9e6f148347
Merge "MountService: Add an ACTION_SHUTDOWN handler and export a method for external shutdown"
2010-01-07 11:35:23 -08:00
San Mehat
91c7761139
MountService: Add an ACTION_SHUTDOWN handler and export a method for external shutdown
...
Signed-off-by: San Mehat <san@google.com>
2010-01-07 10:39:41 -08:00
Cary Clark
2110bb024e
am affa5d2c: remove unused jni interfaces
...
Merge commit 'affa5d2c0f7c2ade43ded5ff9a7952b269183117' into eclair-mr2-plus-aosp
* commit 'affa5d2c0f7c2ade43ded5ff9a7952b269183117':
remove unused jni interfaces
2010-01-07 10:19:56 -08:00
Cary Clark
affa5d2c0f
remove unused jni interfaces
...
Also make package interfaces unused outside of WebView.java
private.
companion change in external/webkit
2010-01-07 13:02:42 -05:00
Dan Egnor
a88025d086
Merge "Remove old EventLog tests from here, they will be replaced by a (better) EventLog test in CTS."
2010-01-07 09:42:57 -08:00