83566 Commits

Author SHA1 Message Date
Kenny Root
7cb079629c am 672cfdc5: Merge "Add AndroidKeyStore provider for KeyStore API" into jb-mr1-dev
* commit '672cfdc5b6194a416eae93f5ebe82cb624e2add6':
  Add AndroidKeyStore provider for KeyStore API
2012-08-20 14:24:11 -07:00
Kenny Root
672cfdc5b6 Merge "Add AndroidKeyStore provider for KeyStore API" into jb-mr1-dev 2012-08-20 14:20:32 -07:00
George Mount
00d2eba501 am 9af67e8f: Merge "Add getDefaultUserAgent to WebSettings." into jb-mr1-dev
* commit '9af67e8f6c7dd98baa6232ff2cda97510b827637':
  Add getDefaultUserAgent to WebSettings.
2012-08-20 13:40:34 -07:00
George Mount
9af67e8f6c Merge "Add getDefaultUserAgent to WebSettings." into jb-mr1-dev 2012-08-20 13:37:55 -07:00
Victoria Lease
66e1635d7f am df8ef4b1: DO NOT MERGE LocaleSpan makes Han disambiguation easy!
* commit 'df8ef4b139a8918895f8a5c62536123da06e81fe':
  DO NOT MERGE LocaleSpan makes Han disambiguation easy!
2012-08-20 13:24:42 -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
Victoria Lease
b853a94284 am 6fb73ab8: Merge "DO NOT MERGE Han Preference" into jb-mr1-dev
* commit '6fb73ab83f9c1b745ccff4fb92babb429b9215ee':
  DO NOT MERGE Han Preference
2012-08-20 13:14:20 -07:00
Victoria Lease
6fb73ab83f Merge "DO NOT MERGE Han Preference" into jb-mr1-dev 2012-08-20 13:11:43 -07:00
Kenny Root
3ca1e412b7 am 80618d66: am 7d5b22af: am f029c22f: Merge "Use Libcore.os.umask for setting umask"
* commit '80618d66b02d8cce325cdaa184435f43818a062b':
  Use Libcore.os.umask for setting umask
2012-08-20 12:59:19 -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
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
Robert Greenwalt
bb1d98473c am 80bb8d29: Merge "Update TCP buffer size when switching network type" into jb-mr1-dev
* commit '80bb8d2906ed90668de66b3b2554e69f97c25412':
  Update TCP buffer size when switching network type
2012-08-20 12:55:10 -07:00
Robert Greenwalt
80bb8d2906 Merge "Update TCP buffer size when switching network type" into jb-mr1-dev 2012-08-20 12:52:24 -07:00
Kenny Root
88ba79b5e7 am fc7e851f: Merge "Add getmtime to Android KeyStore API" into jb-mr1-dev
* commit 'fc7e851fd93a6d6457bbca09117fbe78649dae5d':
  Add getmtime to Android KeyStore API
2012-08-20 12:47:38 -07:00
Kenny Root
fc7e851fd9 Merge "Add getmtime to Android KeyStore API" into jb-mr1-dev 2012-08-20 12:45:17 -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
Kenny Root
f029c22f82 Merge "Use Libcore.os.umask for setting umask" 2012-08-20 12:32:14 -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
947c6424c1 am 99de2459: Merge "Respect child drawing order when dispatching touch events" into jb-mr1-dev
* commit '99de2459e200e0c86d55d5eee7ea000fd030990f':
  Respect child drawing order when dispatching touch events
2012-08-20 11:47:42 -07:00
Dirk Dougherty
1b6b8f13b2 am b3655894: am 69b6a32f: am a18cfcca: Doc change: Remove japanese localized index page.
* commit 'b365589487044c3b0241c8846b6e7843a32bdb0c':
  Doc change: Remove japanese localized index page.
2012-08-20 11:46:00 -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
Dirk Dougherty
b365589487 am 69b6a32f: am a18cfcca: Doc change: Remove japanese localized index page.
* commit '69b6a32f0c9df85b29dc8adc2c1f15e5f52dd6ba':
  Doc change: Remove japanese localized index page.
2012-08-20 11:44:07 -07:00
Dirk Dougherty
69b6a32f0c am a18cfcca: Doc change: Remove japanese localized index page.
* commit 'a18cfccac509e124d0a80c109a5711b336d41f75':
  Doc change: Remove japanese localized index page.
2012-08-20 11:42:30 -07:00
Dirk Dougherty
a18cfccac5 Doc change: Remove japanese localized index page.
Change-Id: I69b60435e7062d6ec39fe91595232695a37f591d
2012-08-20 11:25:49 -07:00
Jean-Baptiste Queru
a9b22bf416 am 9403fca0: am 6a37a254: am e0024573: Merge "Release JNI local references as soon as possible."
* commit '9403fca0b1698ef31285a8a2e3123e22f53b1528':
  Release JNI local references as soon as possible.
2012-08-20 10:49:16 -07:00
Amith Yamasani
7c0c206b28 am 2d78fa2d: am ff7735b0: am a3db5297: Merge "ProviderMap: remove hashmap when entire user specific entries are removed"
* commit '2d78fa2d2558dc8c6d6400232c742da7936c6204':
  ProviderMap: remove hashmap when entire user specific entries are removed
2012-08-20 10:49:13 -07:00
Jean-Baptiste Queru
9403fca0b1 am 6a37a254: am e0024573: Merge "Release JNI local references as soon as possible."
* commit '6a37a254507bb2bff944a0fe984e287994c31846':
  Release JNI local references as soon as possible.
2012-08-20 10:47:46 -07:00
Amith Yamasani
2d78fa2d25 am ff7735b0: am a3db5297: Merge "ProviderMap: remove hashmap when entire user specific entries are removed"
* commit 'ff7735b0ee8c3347d0f3cb1866e454be0e9534e2':
  ProviderMap: remove hashmap when entire user specific entries are removed
2012-08-20 10:47:41 -07:00
Jean-Baptiste Queru
6a37a25450 am e0024573: Merge "Release JNI local references as soon as possible."
* commit 'e00245737cc4844b77f95538e0728a4166b856a0':
  Release JNI local references as soon as possible.
2012-08-20 10:45:17 -07:00
Amith Yamasani
ff7735b0ee am a3db5297: Merge "ProviderMap: remove hashmap when entire user specific entries are removed"
* commit 'a3db5297cda370ce41db99b6839cd9528c31ef7c':
  ProviderMap: remove hashmap when entire user specific entries are removed
2012-08-20 10:45:12 -07:00
Craig Mautner
8f260c9a68 am ec42c3c3: Merge "Ensure that mAllAppWinAnimators is not null." into jb-mr1-dev
* commit 'ec42c3c35fd4c16e1823cfd0e5b589ed2d205aa7':
  Ensure that mAllAppWinAnimators is not null.
2012-08-20 10:33:29 -07:00
Craig Mautner
ec42c3c35f Merge "Ensure that mAllAppWinAnimators is not null." into jb-mr1-dev 2012-08-20 10:30:00 -07:00
Craig Mautner
bea12bdc2e Ensure that mAllAppWinAnimators is not null.
The method showAllWindowsLocked can be called from the layout
side of the WindowManagerService. Previously the AppWindowAnimator
member mAllAppWinAnimators was created on the animation side. If
showAllWindowsLocked was called before the first animation of the
activity an NPE would occur. This fix creates mAllAppWinAnimators
when the AppWindowAnimator is created and also updates it with
current values before calling showAllWindowsLocked.

Fixes bug 6917136.

Change-Id: If3ace22022b65c6888bbb9d0575efe9a45d86475
2012-08-20 10:23:18 -07:00
Jean-Baptiste Queru
e00245737c Merge "Release JNI local references as soon as possible." 2012-08-20 10:17:45 -07:00
Amith Yamasani
a3db5297cd Merge "ProviderMap: remove hashmap when entire user specific entries are removed" 2012-08-20 10:16:36 -07:00
Kenny Root
473c712b19 Add getmtime to Android KeyStore API
java.security.KeyStore requires that you be able to get the creation
date for any given entry. We'll approximate that through using the mtime
of the file in the keystore.

Change-Id: I16f74354a6c2e78a1a0b4dc2ae720c5391274e6f
2012-08-20 09:48:41 -07:00
Przemyslaw Szczepaniak
0430aab3df am 091d56ca: Fix double call to TTS connection disconnect() on reconnect
* commit '091d56cab8f6f6a3460fbb596f99b1a262948e96':
  Fix double call to TTS connection disconnect() on reconnect
2012-08-20 09:01:04 -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
Billy Hewlett
ac1cbaf2e5 DO NOT MERGE Han Preference
Cherry-pick Ib5dd86950156c5a438f25c289acb839206bb455a from master.

Data: label MTLmr3m with "ja" locale attribute, fallback_fonts-ja.xml removed,
as we only need a single fallback font file
Code: Add locale and variant to TextLayoutCache.  Paint.java sets textLocale as
the language (for example, "ja") rather than the language/locale concatenated
(for example "ja_JP")

This checkin, along with Change-Id: Id8c91ae0be6cad8a7ef77a0cd5803676290986c1,
allows text view objects to set their locale dynamically and skia will use the
correct font for the locale.

Change-Id: Ieb60b0d7a39fcfef4f8ce90cd4f6065d33673710
2012-08-20 08:51:23 -07:00
Jeff Brown
30e7d7620c am bf5740e7: Improve display manager debugging.
* commit 'bf5740e75efd87ae0213486e78e029403804c6f0':
  Improve display manager debugging.
2012-08-19 23:26:02 -07:00
Jeff Brown
bf5740e75e Improve display manager debugging.
Change-Id: Iae794fe99a7cf9809f64eafb216091126a2f7e39
2012-08-19 23:20:02 -07:00
Jeff Brown
aa32f5f0db am 98365d76: Refactor for multi-display support.
* commit '98365d7663cbd82979a5700faf0050220b01084d':
  Refactor for multi-display support.
2012-08-19 23:10:13 -07:00
Jeff Brown
2112e19098 am 848c2dc9: Stub out display manager service implementation.
* commit '848c2dc93b6795e171f3dd6f64ea0be65e2762ca':
  Stub out display manager service implementation.
2012-08-19 23:10:09 -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
Guang Zhu
41cae3c2b6 am 82d53ce2: Merge "fix sdcard path for webkit perf and layout test scripts" into jb-mr1-dev
* commit '82d53ce283b7c275624d66e9bf20cfe2614af5c4':
  fix sdcard path for webkit perf and layout test scripts
2012-08-19 15:31:24 -07:00
Guang Zhu
82d53ce283 Merge "fix sdcard path for webkit perf and layout test scripts" into jb-mr1-dev 2012-08-19 15:29:08 -07:00
Guang Zhu
8aaa32b13e fix sdcard path for webkit perf and layout test scripts
paths are moved from /sdcard/ to /sdcard/0/

Change-Id: I27dee294eff033da47c5de17c3b7843790386be3
2012-08-19 15:27:40 -07:00
Amith Yamasani
b3af04465d am 2284c36b: Merge "Fixed static wallpaper for multi-user" into jb-mr1-dev
* commit '2284c36bfac6507be9c4361557a7e8359c319ae4':
  Fixed static wallpaper for multi-user
2012-08-19 07:58:33 -07:00