Commit Graph

26872 Commits

Author SHA1 Message Date
Jean-Baptiste Queru
352c7aa4f8 am 6ba73cc6: am 8bb154c2: Merge "resolved conflicts for merge of 4ea6a8eb to jb-mr1-dev" into jb-mr1-dev
* commit '6ba73cc66273964c707fc638946befc5a1442700':
  Switch widget: Fix ON/OFF option update error
2012-08-20 15:27:16 -07:00
Jean-Baptiste Queru
acbbd1142d resolved conflicts for merge of 4ea6a8eb to jb-mr1-dev
Change-Id: I51b1732011f31ea07087ef0898b47de8977074de
2012-08-20 14:57:23 -07:00
Benoit Goby
427af58304 am e6bc1238: am 7b7feee8: Merge "Add UsbDebuggingManager and UsbDebuggingActivity" into jb-mr1-dev
* commit 'e6bc1238b7e832c4a568f6bd8a1c769dd1d173ea':
  Add UsbDebuggingManager and UsbDebuggingActivity
2012-08-20 14:52:55 -07:00
Jean-Baptiste Queru
4ea6a8eb9f am f515c6f4: Merge "Switch widget: Fix ON/OFF option update error"
* commit 'f515c6f4fe4457de1d5c49f78f9dcf6e4379e335':
  Switch widget: Fix ON/OFF option update error
2012-08-20 14:50:40 -07:00
Benoit Goby
7b7feee803 Merge "Add UsbDebuggingManager and UsbDebuggingActivity" into jb-mr1-dev 2012-08-20 14:48:11 -07:00
rich cannings
4d0b152482 am 8916311d: am a811e084: Merge "Pass URLs to package verifiers" into jb-mr1-dev
* commit '8916311dba4b980c98583ce6ca3333105a286523':
  Pass URLs to package verifiers
2012-08-20 14:28:40 -07:00
Jean-Baptiste Queru
f515c6f4fe Merge "Switch widget: Fix ON/OFF option update error" 2012-08-20 14:28:33 -07:00
Kenny Root
d8b048e81d am 7cb07962: am 672cfdc5: Merge "Add AndroidKeyStore provider for KeyStore API" into jb-mr1-dev
* commit '7cb079629ca2d5a4009ec9a50268b4e7b650677d':
  Add AndroidKeyStore provider for KeyStore API
2012-08-20 14:27:01 -07:00
rich cannings
a811e0848d Merge "Pass URLs to package verifiers" into jb-mr1-dev 2012-08-20 14:24:49 -07:00
Kenny Root
672cfdc5b6 Merge "Add AndroidKeyStore provider for KeyStore API" into jb-mr1-dev 2012-08-20 14:20:32 -07:00
Benoit Goby
4e68bd420b Add UsbDebuggingManager and UsbDebuggingActivity
The UsbDebuggingManager listens to adbd requests and displays a dialog
when the public key authentification fails, for the user to confirm if it
wants to allow USB debugging from the attached host. If the user chooses
to always allow USB debugging, the UsbDebuggingManager writes the public
key to adbd's config file so that the public key authenfication succeeds
next time.

Change-Id: I115c828331d8e326c380844ee33915d5dff22260
2012-08-20 13:44:34 -07:00
George Mount
eb9b2c095d am 00d2eba5: am 9af67e8f: Merge "Add getDefaultUserAgent to WebSettings." into jb-mr1-dev
* commit '00d2eba50172a6763f3414c092be05a3b283b851':
  Add getDefaultUserAgent to WebSettings.
2012-08-20 13:43:14 -07:00
George Mount
9af67e8f6c Merge "Add getDefaultUserAgent to WebSettings." into jb-mr1-dev 2012-08-20 13:37:55 -07:00
rich cannings
706e8ba26b Pass URLs to package verifiers
This change passes the originating URL and accompanied referrer to
package verifiers, when available.

Bug: 6544677
Change-Id: I9ebc71bc13f549bd88267e444816151a99bda000
2012-08-20 13:20:14 -07:00
Victoria Lease
df8ef4b139 DO NOT MERGE LocaleSpan makes Han disambiguation easy!
Cherry-pick of I7f1b0d49a2ece957a7b9b5d65d48385bf2c2a668 from master.

I've also provided TextView.setTextLocale() for use in single-language
TextViews.

Change-Id: I5692859bfd2aafc284172454d943afc250b22535
2012-08-20 13:17:58 -07:00
Kenny Root
df6c26e562 am 3ca1e412: am 80618d66: am 7d5b22af: am f029c22f: Merge "Use Libcore.os.umask for setting umask"
* commit '3ca1e412b720a8bd28fd7e430b38788835ea13e5':
  Use Libcore.os.umask for setting umask
2012-08-20 13:01:45 -07:00
Kenny Root
80618d66b0 am 7d5b22af: am f029c22f: Merge "Use Libcore.os.umask for setting umask"
* commit '7d5b22afae8525cdf80ba1bf8e18b87d597f830d':
  Use Libcore.os.umask for setting umask
2012-08-20 12:57:36 -07:00
Robert Greenwalt
1a1ee224c1 am bb1d9847: am 80bb8d29: Merge "Update TCP buffer size when switching network type" into jb-mr1-dev
* commit 'bb1d98473c737bff05e3ae11d8ec53195e04725a':
  Update TCP buffer size when switching network type
2012-08-20 12:57:28 -07:00
Kenny Root
7d5b22afae am f029c22f: Merge "Use Libcore.os.umask for setting umask"
* commit 'f029c22f82573e7fee7c7e0cca4439fe78300bac':
  Use Libcore.os.umask for setting umask
2012-08-20 12:55:11 -07:00
Kenny Root
e29df16cb5 Add AndroidKeyStore provider for KeyStore API
This introduces a public API for the Android keystore that is accessible
via java.security.KeyStore API. This allows programs to store
PrivateKeyEntry and TrustedCertificateEntry items visible only to
themselves.

Future work should include:

* Implement KeyStore.CallbackHandlerProtection parameter to allow the
  caller to request that the keystore daemon unlock itself via the
  system password input dialog.

* Implement SecretKeyEntry once that support is in keystore daemon

Change-Id: I382ffdf742d3f9f7647c5f5a429244a340b6bb0a
2012-08-20 12:44:40 -07:00
Robert Greenwalt
d14e176272 Update TCP buffer size when switching network type
Import of non-merging change 41612 from AOSP

When PDP connects in GSM network, the TCP buffer window size is
set to max 8760. If the phone swicthes to UMTS, the TCP buffer
size is not updated to UMTS, i.e. GPRS buffer size is still
used with limited data transfer spead as a result.
This fix makes sure the TCP buffer size is updated when
switching network type.

Change-Id: Ic44a557677ffe629e83ce1f522a9f058bee6e7b2
2012-08-20 12:28:51 -07:00
Kenny Root
4c74f8c171 Use Libcore.os.umask for setting umask
Libcore.os now provides a umask method call, so just use that since it's
available.

Change-Id: I8826fa40bcab3d61a424ff98a8050d3e44f7ec34
2012-08-20 12:24:05 -07:00
Adam Powell
6963dfb2f9 am 947c6424: am 99de2459: Merge "Respect child drawing order when dispatching touch events" into jb-mr1-dev
* commit '947c6424c1fa4aaf79429c85c6faff4d1d4d4ed5':
  Respect child drawing order when dispatching touch events
2012-08-20 11:51:05 -07:00
Adam Powell
99de2459e2 Merge "Respect child drawing order when dispatching touch events" into jb-mr1-dev 2012-08-20 11:44:45 -07:00
Przemyslaw Szczepaniak
cf02521b2a am 0430aab3: am 091d56ca: Fix double call to TTS connection disconnect() on reconnect
* commit '0430aab3dfeb6ca9ed3111336abeebfdf78d847b':
  Fix double call to TTS connection disconnect() on reconnect
2012-08-20 09:44:58 -07:00
Przemyslaw Szczepaniak
091d56cab8 Fix double call to TTS connection disconnect() on reconnect
- Sets the service connection to null when unbindService is called,
instead of in onServiceDisconnected. This avoids a double disconnect
if a call to onServiceConnected is received before a call to
onServiceDisconnected.

- Extended synchronize on runAction error handling and reconnection.
This prevents from reconnecting N times if N>1 threads enter this method
while there's issue with TTS service.

Bug:6993880
Change-Id: I5a387622c6032a18d17fc072029ae6be1a9b8e6c
2012-08-20 08:56:39 -07:00
Jeff Brown
b0646addc2 am 30e7d762: am bf5740e7: Improve display manager debugging.
* commit '30e7d7620c7483d93eb8303164d644299b36adcc':
  Improve display manager debugging.
2012-08-19 23:28:16 -07:00
Jeff Brown
bf5740e75e Improve display manager debugging.
Change-Id: Iae794fe99a7cf9809f64eafb216091126a2f7e39
2012-08-19 23:20:02 -07:00
Jeff Brown
ae56520b36 am aa32f5f0: am 98365d76: Refactor for multi-display support.
* commit 'aa32f5f0db25a1553a353d93274f12432e5d07fc':
  Refactor for multi-display support.
2012-08-19 23:12:23 -07:00
Jeff Brown
df408baca5 am 2112e190: am 848c2dc9: Stub out display manager service implementation.
* commit '2112e190986f17e83f7e91d719772c891669be0b':
  Stub out display manager service implementation.
2012-08-19 23:12:19 -07:00
Jeff Brown
98365d7663 Refactor for multi-display support.
Split WindowManagerImpl into two parts, the WindowManager
interface implementation remains where it is but the global
communications with the window manager are now handled by
the WindowManagerGlobal class.  This change greatly simplifies
the challenge of having separate WindowManager instances
for each Context.

Removed WindowManagerImpl.getDefault().  This represents the
bulk of this change.  Most of the usages of this method were
either to perform global functions (now handled by WindowManagerGlobal)
or to obtain the default display (now handled by DisplayManager).

Explicitly associate each new window with a display and make
the Display object available to the View hierarchy.

Add stubs for some new display manager API features.

Start to split apart the concepts of display id and layer stack.
since they operate at different layers of abstraction.
While it's true that each logical display uniquely corresponds to a
surface flinger layer stack, it is not necessarily the case that
they must use the same ids.  Added Display.getLayerStack()
and started using it in places where it was relatively easy to do.

Change-Id: I29ed909114dec86807c4d3a5059c3fa0358bea61
2012-08-19 22:42:08 -07:00
Jeff Brown
848c2dc93b Stub out display manager service implementation.
Reverting to the previous stub as the display adapter registration
and the logical to physical mapping is not at all what we are going
to need moving forward.

Fixed up the service initialization order so that the display manager
service has a context from the start.

Change-Id: I717f2f1099c7a77180ef207c371ec8329258850a
2012-08-19 21:21:37 -07:00
Amith Yamasani
870275de28 am 82bb930b: am 67645821: Merge "Don\'t create cache directory for isolated processes" into jb-mr1-dev
* commit '82bb930b17cb0f2a84b3dd8fa5c0650291ea2383':
  Don't create cache directory for isolated processes
2012-08-19 07:59:18 -07:00
Amith Yamasani
67645821a5 Merge "Don't create cache directory for isolated processes" into jb-mr1-dev 2012-08-19 07:54:36 -07:00
Amith Yamasani
11de39a5cf Don't create cache directory for isolated processes
They don't have access anyway
This makes Chrome work in secondary users

Change-Id: I4d30581bc6e807901e642893d6964854c0567fec
2012-08-17 18:01:24 -07:00
Dianne Hackborn
7ebc491aa4 am fabff0a0: am f337a89b: Merge "More view hierarchy, fragment debugging." into jb-mr1-dev
* commit 'fabff0a081079a4311c9b8f2d50527005d67c796':
  More view hierarchy, fragment debugging.
2012-08-17 17:42:36 -07:00
Dianne Hackborn
f337a89b4d Merge "More view hierarchy, fragment debugging." into jb-mr1-dev 2012-08-17 17:39:09 -07:00
Dianne Hackborn
4702a85697 More view hierarchy, fragment debugging.
Add a View.toString() method.

Rename all of the View private flags to have a PFLAG prefix to
avoid going insane trying to figure out which constant goes with
which flag.

Activity.dump() now includes a summary of the activity's view
hierarchy, using the View.toString() method.

All exceptions thrown by FragmentManager now perform a dump of
the owning activity state, where appropriate.

Change-Id: I6482e397e10cb5a0612ab02ce6ed5131823437a6
2012-08-17 17:35:00 -07:00
Dianne Hackborn
93e3ec3264 am e3d89013: am 5c6912c6: Merge "Fix permission check on ContentProvider to be multi-user aware." into jb-mr1-dev
* commit 'e3d89013c6dc683f911a2372b11ffa3542dd10ae':
  Fix permission check on ContentProvider to be multi-user aware.
2012-08-17 17:04:58 -07:00
Dianne Hackborn
5c6912c6f6 Merge "Fix permission check on ContentProvider to be multi-user aware." into jb-mr1-dev 2012-08-17 17:01:48 -07:00
Dianne Hackborn
0d8af78b74 Fix permission check on ContentProvider to be multi-user aware.
Change-Id: I1e504fe6561caef99d478e37660e2294fec7ea8b
2012-08-17 16:51:54 -07:00
Adam Powell
a6478a3a13 Respect child drawing order when dispatching touch events
Make sure that touch events are always dispatched to the "topmost"
view when views overlap.

Bug 6996501

Change-Id: I4df25dd7531c4b268c8377c0bf0945ab862733b9
2012-08-17 16:42:20 -07:00
Amith Yamasani
ec0d899b2c am ca5d8dc2: am 14e883b2: Fix merge error
* commit 'ca5d8dc2c08f2bfbb0c06e9b7b9cda9776493862':
  Fix merge error
2012-08-17 16:41:33 -07:00
Amith Yamasani
14e883b25e Fix merge error
Didn't apply the recent API change from another CL.

Change-Id: I65ac6108909eca7ac48beabb4a8b7bbedda84249
2012-08-17 16:34:53 -07:00
Amith Yamasani
56f4a67250 am 539d2b56: am 7fdaa397: Merge "Save preferred activity info with user id." into jb-mr1-dev
* commit '539d2b562fa1aa8afc4c3e98209e8b4f6ab56e9c':
  Save preferred activity info with user id.
2012-08-17 16:23:20 -07:00
Amith Yamasani
7fdaa3976d Merge "Save preferred activity info with user id." into jb-mr1-dev 2012-08-17 16:19:19 -07:00
Victoria Lease
ec97b4ddb4 LocaleSpan makes Han disambiguation easy!
I've also provided TextView.setTextLocale() for use in single-language
TextViews.

Change-Id: I7f1b0d49a2ece957a7b9b5d65d48385bf2c2a668
2012-08-17 16:12:46 -07:00
George Mount
9f410c540a Add getDefaultUserAgent to WebSettings.
Bug 6329117
 Add ability to get the default user-agent without creating
 a WebView. The method is implemented for WebSettingsClassic.

Change-Id: Id15fb57f65875752ccf644481a22b88644635f5d
2012-08-17 15:53:13 -07:00
Jonathan Dixon
1b93e278c6 am 36aa961d: am 9271fa69: Merge "Remove checkThread() from findAddress" into jb-mr1-dev
* commit '36aa961d29840c0103ae61f40de88f55e37eb626':
  Remove checkThread() from findAddress
2012-08-17 13:34:24 -07:00
Amith Yamasani
a3f133afe8 Save preferred activity info with user id.
So each user can have their own set of intent resolution preferences.

ResolverActivity now launches the activity on the correct user, and
persists the preference for the correct user.

Bug: 6961905
Change-Id: I6d3a8a9af89bc649277d4fc8d0f367ee123f8392
2012-08-17 13:32:02 -07:00