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

24901 Commits

Author SHA1 Message Date
Jeff Sharkey
ade6351b4f am 33f94286: am 34f86312: Merge "Migrate legacy VPN arguments to system_server." into jb-mr1-dev 
* commit '33f942865c27a0af155ec2be2f1154fe7ece6072':
  Migrate legacy VPN arguments to system_server.
 2012-08-24 11:37:58 -07:00
Jeff Sharkey
34f8631258 Merge "Migrate legacy VPN arguments to system_server." into jb-mr1-dev 2012-08-24 11:33:00 -07:00
Jeff Sharkey
82f8521d38 Migrate legacy VPN arguments to system_server. 
Generate the racoon and mtpd daemon arguments in system_server,
instead of accepting them from Settings.

Bug: 5756357
Change-Id: I42c1a644f6add477fe4222342640d7db15982cb8
 2012-08-24 11:29:58 -07:00
Jeff Sharkey
e292216870 am a9baddac: am 96702ad6: Merge "Framework interface for netd firewall." into jb-mr1-dev 
* commit 'a9baddacf57755f4158c822842adf23c5a9be13b':
  Framework interface for netd firewall.
 2012-08-24 11:12:49 -07:00
Jeff Sharkey
96702ad6d7 Merge "Framework interface for netd firewall." into jb-mr1-dev 2012-08-24 11:07:42 -07:00
Jeff Sharkey
c268f0b19e Framework interface for netd firewall. 
Bug: 5756357
Change-Id: If8b9f738fcea2cf16bd01682220718b57346c7cc
 2012-08-24 11:00:28 -07:00
Teng-Hui Zhu
db4a65b744 am ed407977: am e0d5ceef: Merge "Request Layout after video size changed" into jb-mr1-dev 
* commit 'ed407977253c6bc96ea8f6ca90d96508bbe2002c':
  Request Layout after video size changed
 2012-08-24 10:57:21 -07:00
Teng-Hui Zhu
e0d5ceefbf Merge "Request Layout after video size changed" into jb-mr1-dev 2012-08-24 10:50:49 -07:00
Victoria Lease
821f39c4af am 73eebac0: am 54f4f91d: Merge "avert 2500ms wait in InputMethodManager" into jb-mr1-dev 
* commit '73eebac05d17b8ac0d1071625aad742570a6cd39':
  avert 2500ms wait in InputMethodManager
 2012-08-24 08:06:39 -07:00
Victoria Lease
54f4f91d7c Merge "avert 2500ms wait in InputMethodManager" into jb-mr1-dev 2012-08-24 08:01:41 -07:00
Dianne Hackborn
bbe7bffc03 am feb7a722: am d820c38d: am 513f68bc: am bfe20d1a: am 8bfba7df: Merge "fix wrong substring" 
* commit 'feb7a7222cc86692bd4bbd43ab14fe81454324f9':
  fix wrong substring
 2012-08-24 07:38:37 -07:00
Jean-Baptiste Queru
5d3a27bc1d am 8fe1b09d: am 58dc9b6b: am 790d3403: am d86bebb4: am 322b0a16: Merge "Protecting more views from (bad) MotionEvents" 
* commit '8fe1b09dc2c239065fbdad2bbb3c61db5ef22dec':
  Protecting more views from (bad) MotionEvents
 2012-08-24 07:38:33 -07:00
Dianne Hackborn
d820c38d21 am 513f68bc: am bfe20d1a: am 8bfba7df: Merge "fix wrong substring" 
* commit '513f68bc5a5f15d799f8795392d4861a5704fba1':
  fix wrong substring
 2012-08-24 07:30:11 -07:00
Jean-Baptiste Queru
58dc9b6bfa am 790d3403: am d86bebb4: am 322b0a16: Merge "Protecting more views from (bad) MotionEvents" 
* commit '790d34039df650d983c7c87a2a2e888e18edc2be':
  Protecting more views from (bad) MotionEvents
 2012-08-24 07:30:06 -07:00
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
Teng-Hui Zhu
f5d102ed76 Request Layout after video size changed 
bug:6800665

Change-Id: I57010ac26246dff9da45f8fdb7ccbe39c454c54f
 2012-08-23 16:03:22 -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
Victoria Lease
b570c64ad1 avert 2500ms wait in InputMethodManager 
When dispatching input events to the main thread, the event is
handled directly rather than queued. If we have a timeout waiting for
the event to happen, it has to be registered before we call the
dispatcher, otherwise we'll wait for the timeout even though the event
has already been handled.

Bug: 6734044
Change-Id: I6826163dbc6133b385cf1076bb077fb4e82870a1
 2012-08-23 15:32:42 -07:00
Dianne Hackborn
513f68bc5a am bfe20d1a: am 8bfba7df: Merge "fix wrong substring" 
* commit 'bfe20d1aa1b1236e6592914c5682c59d94936432':
  fix wrong substring
 2012-08-23 15:12:26 -07:00
Jean-Baptiste Queru
790d34039d am d86bebb4: am 322b0a16: Merge "Protecting more views from (bad) MotionEvents" 
* commit 'd86bebb4a9aaf3b98f6d5a189fd7733926d85891':
  Protecting more views from (bad) MotionEvents
 2012-08-23 15:12:21 -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
8bfba7df37 Merge "fix wrong substring" 2012-08-23 14:10:31 -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
Johan Rosengren
0dc291eef6 Protecting more views from (bad) MotionEvents 
When handling MotionEvents, the method findPointerIndex can return -1
if the current pointer id can't be translated to a pointer index.
Some views are not handling this, which will lead to an out-of-
index crash. In 2585e9b there were checks added, this change adds
some more.

Change-Id: I93ce2420afd83a06b689a1ed35ead7d170cd68f1
 2012-08-23 13:46:14 +02: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