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

24880 Commits

Author SHA1 Message Date
Ben Murdoch
ff85c8892f am 42f78d03: am 4d3a7b07: Merge "Make SslErrorHandler ctor public/@hide." into jb-mr1-dev 
* commit '42f78d036483dccfd9893fc375fef46a32bb31fb':
  Make SslErrorHandler ctor public/@hide.
 2012-08-24 02:15:38 -07:00
Ben Murdoch
4d3a7b0752 Merge "Make SslErrorHandler ctor public/@hide." into jb-mr1-dev 2012-08-24 02:10:38 -07:00
Wu-cheng Li
5059691457 am 248ca045: am dad32938: Merge "Add INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE intent." into jb-mr1-dev 
* commit '248ca045fc859062404ddad2e5c2ac42695370f2':
  Add INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE intent.
 2012-08-24 00:38:00 -07:00
Wu-cheng Li
dad32938cd Merge "Add INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE intent." into jb-mr1-dev 2012-08-24 00:07:32 -07:00
Jeff Sharkey
dd0c05a8d1 am 45a630e8: am d5fc86f0: Merge "Begin moving VPN to NetworkStateTracker pattern." into jb-mr1-dev 
* commit '45a630e87ecfa89682d1b8230dd5c6473284e4c1':
  Begin moving VPN to NetworkStateTracker pattern.
 2012-08-23 16:52:05 -07:00
Jeff Sharkey
d5fc86f067 Merge "Begin moving VPN to NetworkStateTracker pattern." into jb-mr1-dev 2012-08-23 16:47:50 -07:00
Jeff Sharkey
899223b97c Begin moving VPN to NetworkStateTracker pattern. 
Created base tracker that handles common bookkeeping, and move VPN
to become a tracker.  VPN status is now reflected in NetworkInfo, and
is mapped to LegacyVpnInfo.

Legacy VPN now "babysits" any init services it starts, watching for
when they stop unexpectedly.

Bug: 5756357
Change-Id: Iba7ec79da69469f6bd9a970cc39cf6b885b4c9c4
 2012-08-23 16:41:06 -07:00
rich cannings
4e7e743e3a am bf3f2858: am 7646c773: Merge "Allow verifiers to extend timeout" into jb-mr1-dev 
* commit 'bf3f28583f9e1b78a4765472375a23abdf8a4513':
  Allow verifiers to extend timeout
 2012-08-23 16:01:46 -07:00
rich cannings
7646c773fa Merge "Allow verifiers to extend timeout" into jb-mr1-dev 2012-08-23 15:56:04 -07:00
rich cannings
d9ef3e5495 Allow verifiers to extend timeout 
Create a new verifier API to extend the timeout for a giving package,
including the resulting action (allow or deny) upon the timeout occuring.

Bug: 6901038
Change-Id: I351f7944327f863aff1d7dd1227be74652fa1511
 2012-08-23 15:39:02 -07:00
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
5385752829 Make SslErrorHandler ctor public/@hide. 
Allow WebViewProvider implementations to subclass SslErrorHandler
but at the same time maintain API compatibility by @hide'ing the
constructor.

Bug: 6238802
Change-Id: I5de268364ed74e59f62439b8612ab682656a7906
 2012-08-23 10:19:59 +01:00
Ben Murdoch
ed965a2cd1 Merge "Make HttpAuthHandler ctor public/@hide." into jb-mr1-dev 2012-08-23 02:17:34 -07:00
Wu-cheng Li
f88320558f Add INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE intent. 
The intent is used to launch camera when the device is secured
(e.g. with a pin, password, pattern, or face unlock).

bug:5955016
Change-Id: I5470cf7ee9deab9677665ef0566bac88bdfd80c6
 2012-08-23 13:57:46 +08: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