33690 Commits

Author SHA1 Message Date
George Mount
9af67e8f6c Merge "Add getDefaultUserAgent to WebSettings." into jb-mr1-dev 2012-08-20 13:37:55 -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
6fb73ab83f Merge "DO NOT MERGE Han Preference" into jb-mr1-dev 2012-08-20 13:11:43 -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
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
99de2459e2 Merge "Respect child drawing order when dispatching touch events" into jb-mr1-dev 2012-08-20 11:44:45 -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
bf5740e75e Improve display manager debugging.
Change-Id: Iae794fe99a7cf9809f64eafb216091126a2f7e39
2012-08-19 23:20:02 -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
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
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
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
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
7fdaa3976d Merge "Save preferred activity info with user id." into jb-mr1-dev 2012-08-17 16:19:19 -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
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
Jonathan Dixon
9271fa6951 Merge "Remove checkThread() from findAddress" into jb-mr1-dev 2012-08-17 13:30:46 -07:00
Robert Greenwalt
c48ee60426 am 6626398a: Merge "Fix for updating TCP buffer size when switching network type"
* commit '6626398a72ae592e3a9184c9b0868df0fc1f1724':
  Fix for updating TCP buffer size when switching network type
2012-08-17 13:28:25 -07:00
John Reck
b5622dad65 Remove checkThread() from findAddress
Bug: 6811978
 This doesn't need checked thread safety - static util methods should
 be thread safe.

Change-Id: Ib652d74ced66e3fa332464106a38522cd941a4cd
2012-08-17 13:05:02 -07:00
Michael Jurka
d2ae85d41e Merge "Adding a thumbnail scale down animation" into jb-mr1-dev 2012-08-17 13:03:15 -07:00
Robert Greenwalt
6626398a72 Merge "Fix for updating TCP buffer size when switching network type" 2012-08-17 13:01:49 -07:00
Dianne Hackborn
79af1dd54c Switch public APIs to use new UserHandle class for identifying users.
Gets rid of "yet another integer" confusion.

Change-Id: Id07ea7307aea7c62f0087c6663a1f1c08e2e5dee
2012-08-17 10:36:08 -07:00
Jean-Baptiste Queru
f1b995f9d0 am 21bf4657: am a688af9c: Merge "TabHost key handling corrected"
* commit '21bf465764938c5f8c82dbf6061c89e138eb73ca':
  TabHost key handling corrected
2012-08-17 10:15:32 -07:00
Jean-Baptiste Queru
21bf465764 am a688af9c: Merge "TabHost key handling corrected"
* commit 'a688af9c6707c9c2f07cc195b072b6c14be03b63':
  TabHost key handling corrected
2012-08-17 10:14:08 -07:00
Fabrice Di Meglio
54e5a825f2 Merge "Improve resolution of RTL related properties" into jb-mr1-dev 2012-08-17 10:09:39 -07:00
Jean-Baptiste Queru
a688af9c67 Merge "TabHost key handling corrected" 2012-08-17 10:02:50 -07:00
Amith Yamasani
2a00329c6d UserHandle to UserSerialNo mapping
Use AtomicFile for usermanager files.

Added a MANAGE_USERS permission that apps (signature permission) can use
to create/query/modify/remove users.

Change-Id: I5cf232232d0539e7508df8ec9b216e29c2351cd9
2012-08-17 09:06:10 -07:00
Magnus Strandberg
1968256926 Fix for updating TCP buffer size when switching network type
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: Iaa527c84f56cae108f4c7276bbed10552faaff6c
2012-08-17 11:38:44 +02:00
Subir Jhanb
2ff0c04844 Merge "Change directory permission to "signature|system"" into jb-mr1-dev 2012-08-16 17:18:21 -07:00
Subir Jhanb
0224ccab3c Change directory permission to "signature|system"
Change-Id: I53dea6984b4577803fdead5caad0112503d2b4e5
2012-08-16 17:04:54 -07:00
Kenny Root
9a994b5350 am 050c87f8: am a950daf5: Merge changes Ieb566a2a,I953057cd
* commit '050c87f87e2a48c7bc90f5b15fb6e4e37e667286':
  Use Libcore's stat instead of FileUtils#getFileStatus
  Use Libcore.os.stat instead of FileUtils
2012-08-16 16:43:20 -07:00
Kenny Root
050c87f87e am a950daf5: Merge changes Ieb566a2a,I953057cd
* commit 'a950daf5c14a0009c2c62e9c3e0e8d51eb0cf7d9':
  Use Libcore's stat instead of FileUtils#getFileStatus
  Use Libcore.os.stat instead of FileUtils
2012-08-16 16:33:40 -07:00
Chet Haase
cc48c144bb Merge "Make animators more robust against ending mid-stream" into jb-mr1-dev 2012-08-16 15:35:29 -07:00
Kenny Root
520ee7bcad am a2e8365c: am 9b0da58e: Merge "Introduce a restorecon JNI binding."
* commit 'a2e8365cc883de0d3e56e9f4af350ecfe1b8fc4c':
  Introduce a restorecon JNI binding.
2012-08-16 15:32:52 -07:00
Kenny Root
a2e8365cc8 am 9b0da58e: Merge "Introduce a restorecon JNI binding."
* commit '9b0da58e3a30b760de37138cdd51d20f269c383e':
  Introduce a restorecon JNI binding.
2012-08-16 15:29:41 -07:00
Kenny Root
617ccc081f am 1090f702: Merge "Remove StatFs from AndroidRuntime JNI"
* commit '1090f7023abefc448a492e143f76f9e0925fd6ee':
  Remove StatFs from AndroidRuntime JNI
2012-08-16 15:29:34 -07:00
Kenny Root
98e15e7893 Use Libcore's stat instead of FileUtils#getFileStatus
Remove the last user of FileUtils#getFileStatus and move it to
Libcore.os.stat instead. Then we can remove the JNI code that does the
equivalent of a stat.

Change-Id: Ieb566a2a8a17c2dd0150724b4eb3ac1cc41c823d
2012-08-16 15:27:55 -07:00
Kenny Root
786cbcacd2 Use Libcore.os.stat instead of FileUtils
PackageManagerService just needed to know the owner for this file, so
just use stat instead so we can remove the old JNI code.

This is the last user of FileUtils#getPermissions so just remove the
FileUtils method as well.

Change-Id: I953057cd6b9de4410f33b6f22e4bddff02fe2988
2012-08-16 15:27:55 -07:00
Kenny Root
3f1e8b90b0 Remove StatFs from AndroidRuntime JNI
Change-Id: I88039794cf3e4a959b37c29c67f16f2dc0751a5c
2012-08-16 14:55:18 -07:00
Kenny Root
9b0da58e3a Merge "Introduce a restorecon JNI binding." 2012-08-16 14:38:30 -07:00
Chet Haase
2936fc0244 Make animators more robust against ending mid-stream
The logic in the frame processing code of ValueAnimator did not handle
the situation of animators being ended while the current animation list
was being processed. In particular, if a call to an animation update
(which could result in a call out to user code) caused that animation, or
other current animators, to end, then there was the risk of running off the
end of the list of current animators.

The fix is to work from a copy of the current animator list, processing frames
on each one only if they also exist in the real animations list.

Issue #6992223 Frequent System UI crash

Change-Id: I742964558f8354f04c311b7b51c7686f26a4dacf
2012-08-16 14:34:04 -07:00
Baligh Uddin
a4a5a85f8f Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-16 14:33:48 -07:00