Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,808 Commits 3 Branches 0 Tags
595ae28dabf7058e22419846f57bb8d4cb44012a
Commit Graph

6456 Commits

Author SHA1 Message Date
San Mehat
595ae28dab Merge "Environment: Catch *all* exceptions from MountService" 2010-01-08 07:19:56 -08: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
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
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
Doug Zongker
914d6597d2 Merge "move Watchdog's settings from Gservices to Secure" 2010-01-07 09:24:01 -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
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
Leon Scroggins
283ae234a7 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
bd6029fc51 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
Leon Scroggins
3a5033996e Request <label> info only when accessing a textfield. 
Previously, we were storing the label info each time we build the
navigation cache.

Requires a change to external/webkit.
 2010-01-07 08:33:34 -05:00
Bjorn Bringert
1b4a031954 Merge "Get correct density info when using resource URIs in ImageView" 2010-01-07 02:21:58 -08:00
Dan Egnor
6916089e83 Remove old EventLog tests from here, they will be replaced by a 
(better) EventLog test in CTS.

Fix some minor errors in the handling of too-large event log values.
 2010-01-07 00:28:58 -08:00
Romain Guy
de057c1dd4 Merge "Fix two ListView bugs related to onAttachedToWindow/onDetachedFromWindow. Bug: #2359368." 2010-01-06 18:50:53 -08:00
Romain Guy
21875052ad Fix two ListView bugs related to onAttachedToWindow/onDetachedFromWindow. 
Bug: #2359368.

onDetachedFromWindow() would never be called for views living in the scrap heap, but onAttachedToWindow() could be called several times for views recycled from the scrap heap.
 2010-01-06 18:48:08 -08:00
Doug Zongker
f68888951a move Watchdog's settings from Gservices to Secure 
Change-Id: Iac1146dafa12f9247874514c9aeefa5f8f83933d
 2010-01-06 16:38:14 -08:00
Bjorn Bringert
9d8d9c22bb Get correct density info when using resource URIs in ImageView 
Before, when an android.resource URI was passed to
ImageView.setImageURI(), it was loaded through an InputStream.
This didn't get the density information correctly.

Instead, we use Resources to load the Drawable, which fixes
the denisty problem.

Change-Id: Ie8427ea04da43f414b49014d012671fc0aa27a30
 2010-01-06 22:52:41 +00:00
San Mehat
d1265febc4 Merge "framework: MountService: Add initial support for Android Secure External Caches" 2010-01-06 14:30:56 -08:00
Dan Egnor
f7b6e1fd21 Merge "Fix SDK build problem until EventLog is published." 2010-01-06 14:15:53 -08:00
Dan Egnor
7402264b50 Fix SDK build problem until EventLog is published. 2010-01-06 14:14:39 -08:00
Leon Scroggins
f291b9fecb am fbd3afb1: am e38fc189: Show label information as hint text 
Merge commit 'fbd3afb1801ed69a5c948241e68b997be3d84f4e'

* commit 'fbd3afb1801ed69a5c948241e68b997be3d84f4e':
  Show label information as hint text
 2010-01-06 14:05:46 -08:00
Doug Zongker
0cb047c0de unhide the RecoverySystem class 
The recovery system is already part of the platform; this class
defines an interface for interacting with it from the regular system.

Change-Id: I87dff8d6c1dbd11ac8f397a3f34ea5cb16d2d227
 2010-01-06 14:02:09 -08:00
San Mehat
3697229cc7 framework: MountService: Add initial support for Android Secure External Caches 
Signed-off-by: San Mehat <san@google.com>
 2010-01-06 13:54:41 -08:00
Jaikumar Ganesh
2790b20c53 am 0b6c6f2c: Merge "Fix media option settings for A2DP." into eclair 
Merge commit '0b6c6f2cbc7490c952141cee6a662ddcdb0bae5b' into eclair-plus-aosp

* commit '0b6c6f2cbc7490c952141cee6a662ddcdb0bae5b':
  Fix media option settings for A2DP.
 2010-01-06 13:46:59 -08:00
Ying Wang
80410b55f1 am 42c98ada: Still use ro.monkey 
Merge commit '42c98ada113ae5b7c72ecb6d0de721ec1d0d3534' into eclair-plus-aosp

* commit '42c98ada113ae5b7c72ecb6d0de721ec1d0d3534':
  Still use ro.monkey
 2010-01-06 13:46:36 -08:00
Leon Scroggins
fbd3afb180 am e38fc189: Show label information as hint text 
Merge commit 'e38fc1898183a6bf8b0542a1d2627cdbcbd63198' into eclair-mr2-plus-aosp

* commit 'e38fc1898183a6bf8b0542a1d2627cdbcbd63198':
  Show label information as hint text
 2010-01-06 13:45:46 -08:00
Maryam Garrett
5e3f6caeb0 Merge "Enable onepointfivetap-and-swipe to select." 2010-01-06 12:51:48 -08:00
Dan Egnor
be5460cb10 Merge "Simplify EventLog interface -- remove supported for nested sequences (which nobody used) and streamline the API, adding documentation in preparation for inclusion in the SDK." 2010-01-06 12:49:43 -08:00
Dan Egnor
62136d3e1c Simplify EventLog interface -- remove supported for nested 
sequences (which nobody used) and streamline the API, adding
documentation in preparation for inclusion in the SDK.

Gut and deprecate EventLogTags, which unfortunately was put
into the public SDK (an oversight).  Include the functionality
in EventLog proper, in a simpler and easier to use manner.

This change doesn't actually un-@hide anything, but it does
change it to @pending.
 2010-01-06 12:30:12 -08:00
Jaikumar Ganesh
6309689e6c Fix media option settings for A2DP. 
Incoming connections move the A2DP state to Connecting
before getting authorized, which messes up the priorities.

Dr No: Eastham
Bug: 2358414
 2010-01-06 11:43:10 -08:00