Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
84,324 Commits 3 Branches 0 Tags
bbdb323b44e663ca3d6c5f0cfaff1a660abf790d
Commit Graph

24868 Commits

Author SHA1 Message Date
Adam Powell
bbdb323b44 am 0474282f: am 11a03afa: Merge "Properly respect divider settings for TableLayout" into jb-mr1-dev 
* commit '0474282f7e3c363adbaaf3f5409e0cf35efd6604':
  Properly respect divider settings for TableLayout
 2012-08-23 14:22:55 -07:00
Adam Powell
11a03afaad Merge "Properly respect divider settings for TableLayout" into jb-mr1-dev 2012-08-23 14:18:22 -07:00
Adam Powell
c3c0e39ab5 Properly respect divider settings for TableLayout 
Make sure that TableLayout always knows it's in VERTICAL orientation.

Bug 7041351

Change-Id: I9935891a58e558840ac7956a0ffe8448e21de799
 2012-08-23 14:13:10 -07:00
Dianne Hackborn
bc4c67af77 am 489a185b: am 5d1122a3: Merge "Fix issue #7016987: Unable to attach a picture in gmail/emaill composer action." into jb-mr1-dev 
* commit '489a185bb8aa9983207e8c6a38bbdd7be3966aed':
  Fix issue #7016987: Unable to attach a picture in gmail/emaill composer action.
 2012-08-23 14:05:25 -07:00
Dianne Hackborn
5d1122a3f8 Merge "Fix issue #7016987: Unable to attach a picture in gmail/emaill composer action." into jb-mr1-dev 2012-08-23 14:00:22 -07:00
Dianne Hackborn
f1c26e2fd0 Fix issue #7016987: Unable to attach a picture in gmail/emaill composer action. 
Change-Id: I0c9336bb072b4622a5eab6d3ec104c4cc38e367a
 2012-08-23 13:59:40 -07:00
Doug Zongker
c5ae986e9a am af4a0f1d: am d8b6fa29: Merge "pass --locale argument to recovery" into jb-mr1-dev 
* commit 'af4a0f1d864de49d43b0c4924285f0699d4b7b89':
  pass --locale argument to recovery
 2012-08-23 13:21:57 -07:00
Doug Zongker
d8b6fa2931 Merge "pass --locale argument to recovery" into jb-mr1-dev 2012-08-23 13:17:25 -07:00
John Spurlock
38aea3a6a6 am d8351a48: am 21b53df7: Merge "Add framework support for multiple dreams." into jb-mr1-dev 
* commit 'd8351a48b0836a43e8522d373cc43603c9f92e11':
  Add framework support for multiple dreams.
 2012-08-23 10:49:32 -07:00
John Spurlock
21b53df7c3 Merge "Add framework support for multiple dreams." into jb-mr1-dev 2012-08-23 10:44:05 -07:00
Amith Yamasani
3ffbe416e6 am eea5e1f5: am 41d4332a: Merge "Handle null cache directory" into jb-mr1-dev 
* commit 'eea5e1f504e2c578c4881dd0a0dd4ef45e506da1':
  Handle null cache directory
 2012-08-23 10:18:20 -07:00
Amith Yamasani
41d4332ab0 Merge "Handle null cache directory" into jb-mr1-dev 2012-08-23 10:13:42 -07:00
Amith Yamasani
92d570529c Handle null cache directory 
data/android directory doesn't exist sometimes, and hence cache
directory creation fails. Don't crash the process due to that.

Change-Id: I22d7ed5df9c70f021a87029e89a13a11b4b0303b
 2012-08-23 10:07:52 -07:00
Doug Zongker
e33b4007ee pass --locale argument to recovery 
When RecoverySystem boots into recovery (to install an update or wipe
data and/or cache), pass the --locale argument with the currently
selected locale.

Change-Id: Ib280330932a402be2011207bff8f05caa9b999cd
 2012-08-23 09:52:14 -07:00
Craig Mautner
33f47a72bb am dbc93bf2: am 6715d1ef: Merge "Clean up displayId and layerStack usage." into jb-mr1-dev 
* commit 'dbc93bf2406f9af5303660b932c78ebd4b0d4737':
  Clean up displayId and layerStack usage.
 2012-08-23 08:49:11 -07:00
Craig Mautner
6715d1effa Merge "Clean up displayId and layerStack usage." into jb-mr1-dev 2012-08-23 08:44:53 -07:00
Craig Mautner
b47bbc3d80 Clean up displayId and layerStack usage. 
Make better use of Display object by saving it in DisplayContent.
Only use layerStack when referring to Surfaces. Get displayId from
default Display or default DisplayContent. Remove warnings.

Fixes bug 7038151.

Change-Id: Ie493f0f5e755dc9b91ee969ff561c2a098283ead
 2012-08-23 08:43:54 -07:00
Ben Murdoch
6a49d00307 am a6b7bb21: am ed965a2c: Merge "Make HttpAuthHandler ctor public/@hide." into jb-mr1-dev 
* commit 'a6b7bb2131805e88a1e87c1b80b65da896819e6e':
  Make HttpAuthHandler ctor public/@hide.
 2012-08-23 02:23:00 -07:00
Ben Murdoch
ed965a2cd1 Merge "Make HttpAuthHandler ctor public/@hide." into jb-mr1-dev 2012-08-23 02:17:34 -07:00
Jeff Sharkey
d0f673d020 am af29c279: am 3451dc90: Merge "Iteration on multi-user external storage." into jb-mr1-dev 
* commit 'af29c2797634675280c3e695d8b68674c8490507':
  Iteration on multi-user external storage.
 2012-08-22 18:23:02 -07:00
Jeff Sharkey
3451dc9064 Merge "Iteration on multi-user external storage." into jb-mr1-dev 2012-08-22 18:17:30 -07:00
Craig Mautner
823fe040bc am c91e00c8: am b9b56954: Merge "Eliminate special battery calls by WindowManager" into jb-mr1-dev 
* commit 'c91e00c8b4a223a022289b675cee4b3316122786':
  Eliminate special battery calls by WindowManager
 2012-08-22 14:19:55 -07:00
Craig Mautner
b9b56954ec Merge "Eliminate special battery calls by WindowManager" into jb-mr1-dev 2012-08-22 14:14:54 -07:00
Jeff Sharkey
2bca868361 Iteration on multi-user external storage. 
Remove single-user bind mounts, since they need to remain as raw
mounts to correctly propagate when remounted.  This means we're back
to using sdcard_r GID to enforce READ_EXTERNAL_STORAGE.

Bug: 6925012
Change-Id: I41b5d7ddc985a5df2e288632a0a80d4724089e00
 2012-08-22 13:59:58 -07:00
John Spurlock
1a868b7981 Add framework support for multiple dreams. 
Bug:7028665
Change-Id: I4fba6b8e39dc07af4490c621ac3bc7b3867371b2
 2012-08-22 16:49:20 -04:00
Ben Murdoch
2433fe9f04 Make HttpAuthHandler ctor public/@hide. 
The Chromium WebView Provider needs to subclass HttpAuthHandler
so that we can adapt a ChromHttpAuthHandler into an
android.webkit.HttpAuthHandler. Currently the constructor (that
does nothing) is package private. So to satisfy the subclass
requirement, make it public, and to satisfy the API, make it
@hide.

Bug: 7034995
Change-Id: I9846aecacce078696db5be709394afb980eb25a6
 2012-08-22 19:46:45 +01:00
Irfan Sheriff
31ff774df7 am a63d11de: am dfe55787: am c584a24b: am 2140d1de: Merge "Avoid system_server crashing due to mac address is null" 
* commit 'a63d11de448984b82f5076f89b938fe2a1d00cad':
  Avoid system_server crashing due to mac address is null
 2012-08-22 11:07:22 -07:00
Irfan Sheriff
dfe5578771 am c584a24b: am 2140d1de: Merge "Avoid system_server crashing due to mac address is null" 
* commit 'c584a24ba1af0c831adf46fe57b69af396fb925c':
  Avoid system_server crashing due to mac address is null
 2012-08-22 11:03:13 -07:00
Craig Mautner
259328c04c Eliminate special battery calls by WindowManager 
Previous to this change the WindowManager was notifying the
BatteryDtatsService about windows that keep the screen on. WM used a
custom WakeLock tag to indicate to PowerManagerService that it had
already notified the BatteryStatsService.

This change eliminates WindowManager notifying the BatteryStatsService
and lets PowerManagerService do the job.

Fixes bug 7030326.

Change-Id: I666dc6ef8f094b8d3d109fea6876be058e057b4f
 2012-08-22 11:01:35 -07:00
Irfan Sheriff
c584a24ba1 am 2140d1de: Merge "Avoid system_server crashing due to mac address is null" 
* commit '2140d1de47579db839b6a4ccc87394e80449d7a6':
  Avoid system_server crashing due to mac address is null
 2012-08-22 11:01:03 -07:00
Amith Yamasani
19256a7bb6 am 5ee6095e: am 98dddda7: Merge "Remove permission requirement for some UserManager calls" into jb-mr1-dev 
* commit '5ee6095e25e314317196fd72ca405847e849f6b3':
  Remove permission requirement for some UserManager calls
 2012-08-22 10:35:15 -07:00
Amith Yamasani
98dddda791 Merge "Remove permission requirement for some UserManager calls" into jb-mr1-dev 2012-08-22 10:31:30 -07:00
Amith Yamasani
1952637425 Remove permission requirement for some UserManager calls 
Update javadocs to be explicit about permissions.
Minor fixes in UserManagerService

Change-Id: I0d355e0a60e5dbdb49ed06091111d480ff249f3d
 2012-08-22 10:28:56 -07:00
Selim Gurun
cce299a2f4 am d9dad604: am 6479ecd1: Merge "Fix onFindResultReceived API" into jb-mr1-dev 
* commit 'd9dad6043c4b239907a47bf97409049e8ba014b0':
  Fix onFindResultReceived API
 2012-08-22 09:10:17 -07:00
Selim Gurun
6479ecd1b2 Merge "Fix onFindResultReceived API" into jb-mr1-dev 2012-08-22 09:06:04 -07:00
Jeff Brown
76a855f0e2 am 7e68e923: am 11167b88: Merge "Make the screen brightness setting limits configurable." into jb-mr1-dev 
* commit '7e68e923058295b5b0b789f00cf66d0a289e2115':
  Make the screen brightness setting limits configurable.
 2012-08-21 23:23:06 -07:00
Jeff Brown
128e527ffc am 64ce3396: am 572a0859: Merge "Add FloatMath.pow." into jb-mr1-dev 
* commit '64ce3396dba49e95a0fbf912890c91d3339b7b87':
  Add FloatMath.pow.
 2012-08-21 23:20:22 -07:00
Jeff Brown
11167b887a Merge "Make the screen brightness setting limits configurable." into jb-mr1-dev 2012-08-21 23:19:08 -07:00
Jeff Brown
572a0859dd Merge "Add FloatMath.pow." into jb-mr1-dev 2012-08-21 23:15:56 -07:00
Jeff Brown
f9bba13692 Make the screen brightness setting limits configurable. 
Change-Id: Ica84951c482edef6b7faebe1af22c609a1b9e8be
 2012-08-21 22:27:42 -07:00
Jeff Brown
e2c279e8a1 Add FloatMath.pow. 
Change-Id: I5c584f4894caba47fccfa22ba95f8665990d516c
 2012-08-21 22:27:41 -07:00
Chih-Wei Huang
21326d8b77 Avoid system_server crashing due to mac address is null 
It's possible that the mac address is null (getMacAddress() of WifiNative.java).
In this case system_server will crash like:

E AndroidRuntime: *** FATAL EXCEPTION IN SYSTEM PROCESS: WifiWatchdogStateMachine
E AndroidRuntime: java.lang.NullPointerException
E AndroidRuntime:        at android.net.arp.ArpPeer.<init>(ArpPeer.java:57)
E AndroidRuntime:        at android.net.wifi.WifiWatchdogStateMachine.doArpTest(WifiWatchdogStateMachine.java:866)

Check the mac address before parsing to avoid crashing.

Change-Id: I5d4205c04d479a3a2837172c6382816ea4bf74d6
 2012-08-22 11:26:51 +08:00
Selim Gurun
92b81a3e4b Fix onFindResultReceived API 
This is to fix open source bug 36509, i.e.
http://code.google.com/p/android/issues/detail?id=36509
the parameters are swapped.

Change-Id: I6245d254943c7c97e847a241d0069d85118763f7
 2012-08-21 18:02:47 -07:00
Selim Gurun
a6d16993eb Merge "Small tidy up to getDefaultUserAgent. DO NOT MERGE" into jb-mr1-dev 2012-08-21 16:12:56 -07:00
Jonathan Dixon
951fcabef6 Small tidy up to getDefaultUserAgent. DO NOT MERGE 
- no need for WebSettings to bounce via WebView to get to the factory
- move this static (non-factory) method into the Statics inner class.

Bug: 6329117

Clean cherry pick: d1c4faa5a4

Change-Id: I96807df0171c7308421ca8811cfcb1bf710cb007
 2012-08-21 16:08:22 -07:00
Selim Gurun
b62999c136 Merge "Implement WebSettings.{get|set}TextSize via {get|set}TextZoom. DO NOT MERGE" into jb-mr1-dev 2012-08-21 16:06:04 -07:00
Mikhail Naganov
9d5e7aa38d Implement WebSettings.{get|set}TextSize via {get|set}TextZoom. DO NOT MERGE 
TextSize is deprecated, so we wouldn't expect from WebViewProvider
implementations to re-implement it in some other way than Android WebView does
it. This also makes recently added TextSize.getValue method redundant.

Clean cherry pick: 1202d66f78

Change-Id: Ib6aecb187f10ac3ec5d12cb839cb814ec0c564fe
 2012-08-21 15:52:40 -07:00
Dianne Hackborn
6908eee2bb am 37674ee7: am b4f56b5e: am 8b97ee6d: am b0b4a704: Merge "ActivityThread: Avoid creating duplicate handlers and reuse mH" 
* commit '37674ee787533cc992951e8f41bd67717995a9c1':
  ActivityThread: Avoid creating duplicate handlers and reuse mH
 2012-08-21 15:47:57 -07:00
Dianne Hackborn
b4f56b5ea2 am 8b97ee6d: am b0b4a704: Merge "ActivityThread: Avoid creating duplicate handlers and reuse mH" 
* commit '8b97ee6d8c26974a6fc9ce85c3d7a07ca1e9cac2':
  ActivityThread: Avoid creating duplicate handlers and reuse mH
 2012-08-21 15:42:42 -07:00
Dianne Hackborn
8b97ee6d8c am b0b4a704: Merge "ActivityThread: Avoid creating duplicate handlers and reuse mH" 
* commit 'b0b4a704400319ceaa1002f3194a40553a00cc82':
  ActivityThread: Avoid creating duplicate handlers and reuse mH
 2012-08-21 15:39:42 -07:00