drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,816 Commits 1 Branch 0 Tags
Commit Graph

16816 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Trevor Johns
7f9ea43fae 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
f6de904a3c 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
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
Doug Zongker
60545527b6 Merge "remove GoogleWebContentHelper class" 2010-01-07 18:14:05 -08:00
Jason Sams
917cd4fcda Fix npot but where mipmap level sizes were rounding in the wrong direction. Should always be floor. 2010-01-07 16:26:42 -08:00
Jason Sams
6286953ece Change user attribs to look for empty slot rather than using them in order. Prevents conflict with numbered legacy slots. 2010-01-07 16:26:42 -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
Trevor Johns
063d03ed08 Converting tabs to spaces in docs/html/resources/resources_toc.cs. 2010-01-07 15:44:33 -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
dde2539798 MountService: Remove ACTION_SHUTDOWN handler 
Shutdown handlers run too early for unmounting, so don't handle it.
Shutdown will be called explicitly from the ShutdownThread

Signed-off-by: San Mehat <san@google.com>
 2010-01-07 11:36:22 -08:00
San Mehat
1b780a0190 Merge "PowerManagerService: Switch to using MountService shutdown for media" 2010-01-07 11:35:29 -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
1e512790bf PowerManagerService: Switch to using MountService shutdown for media 
Signed-off-by: San Mehat <san@google.com>
 2010-01-07 10:40:29 -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
Scott Main
0a49913c81 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
707ca41d1f 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
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
Scott Main
d88588935e Merge "docs: fix some broken links" into eclair 2010-01-07 10:18:45 -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
Doug Zongker
914d6597d2 Merge "move Watchdog's settings from Gservices to Secure" 2010-01-07 09:24:01 -08:00
Xavier Ducrohet
f80a762400 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
1ee5ceb92d 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
93cee56d87 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
1060147d5c 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