Joe Onorato
51632e800a
less log spew
2010-01-08 15:46:24 -05:00
San Mehat
3e0a34ff32
Merge "MountService: Fix asec list bug"
2010-01-08 12:38:24 -08:00
Erik Pasternak
c0ce7a6aad
Merge "b/2293263 Finished removing busyBits references."
2010-01-08 10:45:35 -08:00
Eric Fischer
9823a92167
Merge "Update with latest translations."
2010-01-08 10:00:58 -08:00
Andrei Popescu
0e34ec2c58
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
98de6c4a91
Merge "Deprecate onTooManyRedirects."
2010-01-08 09:23:44 -08:00
Vasu Nori
455499ce1f
Merge "when finalizing SQLiteCursor, close it but don't throw exceptions."
2010-01-08 09:21:31 -08:00
Doug Zongker
3f83f7ec41
Merge "remove Settings.Gservices"
2010-01-08 08:41:17 -08:00
San Mehat
d4ed21ea58
Merge "Environment: Catch *all* exceptions from MountService"
2010-01-08 07:19:56 -08:00
Leon Scroggins
a79b658c9f
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
27b37bc29d
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
a9dc0f7f88
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
Dan Egnor
4cd85bb32d
Merge "Bumper un-@hide (un-@pending actually) of previously reviewed APIs:"
2010-01-07 19:16:34 -08:00
Trevor Johns
f34a7a7087
am f6de904a: am 063d03ed: Converting tabs to spaces in docs/html/resources/resources_toc.cs.
...
Merge commit 'f6de904a3c62895c691ce82dbf84e2abf0bdd019'
* commit 'f6de904a3c62895c691ce82dbf84e2abf0bdd019':
Converting tabs to spaces in docs/html/resources/resources_toc.cs.
2010-01-07 19:02:03 -08:00
Trevor Johns
aac9e9f3fa
am 063d03ed: Converting tabs to spaces in docs/html/resources/resources_toc.cs.
...
Merge commit '063d03ed0882582840c7db610635aa89c1a01eec' into eclair-plus-aosp
* commit '063d03ed0882582840c7db610635aa89c1a01eec':
Converting tabs to spaces in docs/html/resources/resources_toc.cs.
2010-01-07 18:58:35 -08:00
Doug Zongker
c901f0fc1a
Merge "remove GoogleWebContentHelper class"
2010-01-07 18:14:05 -08:00
Doug Zongker
cf504c40b2
change remaining frameworks/base Gservices to Secure settings
...
Change-Id: I61bdb05a2526523700c2833154d5a4133881ef10
2010-01-07 15:00:37 -08:00
Erik Pasternak
072ba687d6
Merge "b/2358627 and b/2293263 Fixed eventDay bugs."
2010-01-07 13:52:08 -08:00
Dirk Dougherty
122b788514
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
e70b5fca84
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
8fc26bc215
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
San Mehat
4c6a4cc2e1
Merge "PowerManagerService: Switch to using MountService shutdown for media"
2010-01-07 11:35:29 -08:00
San Mehat
5da3fd5c5a
Merge "MountService: Add an ACTION_SHUTDOWN handler and export a method for external shutdown"
2010-01-07 11:35:23 -08:00
Scott Main
cc8fb61bae
am 707ca41d: am d8858893: Merge "docs: fix some broken links" into eclair
...
Merge commit '707ca41d1f93e54aa0abcf3455522ba8d4c8affb'
* commit '707ca41d1f93e54aa0abcf3455522ba8d4c8affb':
docs: fix some broken links
2010-01-07 10:26:49 -08:00
Scott Main
5c7069a340
am d8858893: Merge "docs: fix some broken links" into eclair
...
Merge commit 'd88588935e3a09b4b13753d55dbe8a8e9ed240a1' into eclair-plus-aosp
* commit 'd88588935e3a09b4b13753d55dbe8a8e9ed240a1':
docs: fix some broken links
2010-01-07 10:21:52 -08:00
Cary Clark
c186005f69
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
Scott Main
e90d1b1f60
Merge "docs: fix some broken links" into eclair
2010-01-07 10:18:45 -08:00
Dan Egnor
29bff34cce
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
Doug Zongker
74a5c34802
Merge "move Watchdog's settings from Gservices to Secure"
2010-01-07 09:24:01 -08:00
Xavier Ducrohet
4b83794c88
am de0ef181: am ce60d4b2: Merge "Move Layoutlib API library to sdk.git" into eclair
...
Merge commit 'de0ef181516ce13d292eafb741fa6c6b9dc1cb1c'
* commit 'de0ef181516ce13d292eafb741fa6c6b9dc1cb1c':
Move Layoutlib API library to sdk.git
2010-01-07 09:22:16 -08:00
Jaikumar Ganesh
2133a9f10b
am 2790b20c: am 0b6c6f2c: Merge "Fix media option settings for A2DP." into eclair
...
Merge commit '2790b20c537b33dbf366436f6d27776148ded490'
* commit '2790b20c537b33dbf366436f6d27776148ded490':
Fix media option settings for A2DP.
2010-01-07 09:22:04 -08:00
Dianne Hackborn
a0c910153d
am ce56857e: am cb2d50d0: Fix issue #2357259 : aapt tool prints "uses-configuation:"
...
Merge commit 'ce56857ef72538c197afd91b9f30dc868d2667d9'
* commit 'ce56857ef72538c197afd91b9f30dc868d2667d9':
Fix issue #2357259 : aapt tool prints "uses-configuation:"
2010-01-07 09:21:52 -08:00
Ying Wang
45c4ad922c
am 80410b55: am 42c98ada: Still use ro.monkey
...
Merge commit '80410b55f1eccf345fb6a01ca9a277935ac4098f'
* commit '80410b55f1eccf345fb6a01ca9a277935ac4098f':
Still use ro.monkey
2010-01-07 09:21:40 -08:00
Tom O'Neill
b9d770c8f4
Merge "Update Notepad tutorial documentation to match code"
2010-01-07 09:18:55 -08:00
Xavier Ducrohet
05cba4c4b7
am ce60d4b2: Merge "Move Layoutlib API library to sdk.git" into eclair
...
Merge commit 'ce60d4b27e17d98423fd339f61e8b746866f1f4e' into eclair-plus-aosp
* commit 'ce60d4b27e17d98423fd339f61e8b746866f1f4e':
Move Layoutlib API library to sdk.git
2010-01-07 09:16:32 -08:00
Xavier Ducrohet
421b581977
Merge "Move Layoutlib API library to sdk.git" into eclair
2010-01-07 09:08:06 -08:00
Leon Scroggins
5988ae3b2c
am bd6029fc: am 3a503399: Request <label> info only when accessing a textfield.
...
Merge commit 'bd6029fc5171e1094a00cdecb3f33aae6fe69c9f'
* commit 'bd6029fc5171e1094a00cdecb3f33aae6fe69c9f':
Request <label> info only when accessing a textfield.
2010-01-07 06:00:17 -08:00
Leon Scroggins
891229c1bf
am 3a503399: Request <label> info only when accessing a textfield.
...
Merge commit '3a5033996e9df21abbd5b296d817c2acaedcb0f9' into eclair-mr2-plus-aosp
* commit '3a5033996e9df21abbd5b296d817c2acaedcb0f9':
Request <label> info only when accessing a textfield.
2010-01-07 05:46:19 -08:00
Bjorn Bringert
d4621042d5
Merge "Get correct density info when using resource URIs in ImageView"
2010-01-07 02:21:58 -08:00
Mike Lockwood
8c493bb829
Merge "Fix broken Javadoc link."
2010-01-06 20:17:10 -08:00
Mike Lockwood
9115d11b80
Merge "Add LocationManagerImpl class to act as a public wrapper for the ILocationProvider interface"
2010-01-06 19:43:42 -08:00
Romain Guy
09681c2ce1
Merge "Fix two ListView bugs related to onAttachedToWindow/onDetachedFromWindow. Bug: #2359368."
2010-01-06 18:50:53 -08:00
James Dong
72bb4839ef
Merge "Add MPEG to the file extensions that scanner cares"
2010-01-06 17:26:01 -08:00
Jason Sams
2f6f1206a6
Merge "Support npot on es 2.0 HW."
2010-01-06 17:25:32 -08:00
Oscar Montemayor
8dbcdd84b2
Merge "Apps on SD card project. A simple keystore to store system-only key material, by leveraging file system access permissions."
2010-01-06 17:09:33 -08:00
San Mehat
7d0930f25a
Merge "PowerManagerService: When rebooting, ensure external storage is unmounted"
2010-01-06 16:45:52 -08:00
Doug Zongker
bbbe67b297
Merge "add ACCESS_CACHE_FILESYSTEM permission to core manifest"
2010-01-06 16:02:46 -08:00
San Mehat
c11d7a6a07
Merge "framework: MountService: Add initial support for Android Secure External Caches"
2010-01-06 14:30:56 -08:00
Dan Egnor
eb9685ef47
Merge "Fix SDK build problem until EventLog is published."
2010-01-06 14:15:53 -08:00
Joe Onorato
9df1115e5e
Merge "Stop spamming the log."
2010-01-06 14:10:33 -08:00