159243 Commits

Author SHA1 Message Date
Neil Fuller
d950ad034c Avoid static initialization of Layout from TextUtils
This works around a bug in standalone (e.g. non-Zygote)
runtimes when a device is attached to a host that is running
DDM.

There is a race condition:

When the runtime receives a HELLO from DDM it calls
TextUtils.isEmpty().

Calling any TextUtils methods statically initializes
Layout. Layout has dependencies on other classes, which in
turn have dependencies on native methods that are not always
registered when the call takes place. Registration and DDM
handling are done in separate threads.

This is not a fix, merely a workaround until the race can
be resolved.

Bug: 18081539
(cherry-picked from commit d29bdb266d54b4551f42776bb790e80147a279d0)

Change-Id: Id0d8578eab9e59d479a7c1b2e7ea1890ac0c8de6
2015-02-06 17:34:37 +00:00
Lorenzo Colitti
c565a5675a Merge "Also include the domain when parceling StaticIpConfiguration." 2015-01-30 07:07:49 +00:00
Lorenzo Colitti
fba459d345 Merge "Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()" 2015-01-30 07:00:38 +00:00
Christopher Ferris
dbd03924d8 Merge "Fix wrap property creation when truncating." 2015-01-29 23:41:06 +00:00
Christopher Ferris
e32df45fe1 Fix wrap property creation when truncating.
If a property name gets truncated, make sure it doesn't end in a '.'
since that makes the name illegal.

Bug: 19196358
Bug: https://code.google.com/p/android/issues/detail?id=82947
Change-Id: Icc1a26593237ca19ad0ebd776a60b3d6290bb355
2015-01-29 12:20:06 -08:00
Lorenzo Colitti
d0cc544039 Also include the domain when parceling StaticIpConfiguration.
StaticIpConfiguration objects are parceled at least as part of the
IpConfiguration objects that are passed to IEthernetManager when an
application sets static IP configuration on Ethernet.

Change-Id: I49991e2f591cc6cf01b503c18eb343b5929efe29
2015-01-29 12:20:55 +00:00
Lorenzo Colitti
106da5bf80 Merge "Support connecting to networks with misconfigured subnet masks." 2015-01-29 08:35:36 +00:00
Paul Jensen
b3b70975d9 Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()
setDomain() and toLinkProperties() were not setting the domains.
The setDomain() bug affected Wifi and I believe the toLinkProperties()
bug affected Ethernet and Bluetooth reverse-tethering.

(cherry picked from commit c53113b37f33c7ed19660c8ec5bfd578e8bb5409)

bug:18252947
Change-Id: I6235fcd6b875aee516efbb5f880db1a99380355b
2015-01-29 17:12:35 +09:00
Lorenzo Colitti
8316b819b2 Support connecting to networks with misconfigured subnet masks.
In K and earlier, we would connect to a network where the gateway
was not covered by the subnet mask of the IP address. This is an
invalid configuration, but it used to work, and other OSes appear
to accept it too, so support it.

Bug: 19067207

(cherry picked from commit 2dfb79a54adeb4bcf1f62332a9db467fce302ced)

Change-Id: I80088f291466dbd5a47f360dcc1620acee5cf57e
2015-01-28 20:36:37 +09:00
Jason Sams
4dd0cf42f5 Merge "Initialize clipping structure" 2015-01-27 20:41:43 +00:00
Marco Nelissen
4e85359879 Merge "Fix printf format" 2015-01-27 20:19:46 +00:00
Marco Nelissen
6cd6110773 Fix printf format
Change-Id: Ied2f10bb59fe0e13b23bf1f9913ab3b081348a28
2015-01-27 12:17:48 -08:00
Marco Nelissen
e74da38e21 Merge "Make SoundPool use MediaCodec" 2015-01-27 17:49:02 +00:00
Yabin Cui
3812e68ea7 Merge "kill HAVE_PTHREADS." 2015-01-27 06:49:16 +00:00
Yabin Cui
1610486d37 kill HAVE_PTHREADS.
Bug: 19083585
Change-Id: Ib466949bb6cd6d1bbc4680e989f0f9fae62ca564
2015-01-26 22:32:38 -08:00
Jason Sams
14331ab1c3 Initialize clipping structure
placeholder until array clipping is added to the API.

Change-Id: Ib20dbd71989c559c0669385a5088ec261596913c
2015-01-26 18:15:05 -08:00
Elliott Hughes
82a1a2c639 Merge "Add missing <string.h> includes." 2015-01-25 19:17:42 +00:00
Elliott Hughes
35af2c3534 Add missing <string.h> includes.
Change-Id: I188bfe1388fa49f6f79d247aa0d0f4fb089de503
2015-01-25 08:33:36 -08:00
Marco Nelissen
372be8970c Make SoundPool use MediaCodec
Bug: 18239054
Change-Id: Ia144fc1bbb0d2787638ee972e2224339b4965310
2015-01-23 12:49:36 -08:00
Narayan Kamath
fe24754fd6 Merge "Remove superfluous OpenSSL include paths." 2015-01-23 10:47:34 +00:00
Adam Langley
0e7829e428 Remove superfluous OpenSSL include paths.
The libcrypto and libssl modules (and their respective static and host
versions) use LOCAL_EXPORT_C_INCLUDE_DIRS thus just including the module
is sufficient.

Change-Id: I467f1b1d038b5136fa22b1230da134c394eac54e
2015-01-22 17:15:13 -08:00
Jason Sams
231df77eff Merge "Fix default compute thread priority" 2015-01-22 21:08:44 +00:00
Jason Sams
081cda87e1 Merge "Add FP16 types to the list of RenderScript types." 2015-01-22 21:08:03 +00:00
Narayan Kamath
dca23321c6 Merge "Add support for persist.sys.locale." 2015-01-22 13:49:43 +00:00
Narayan Kamath
d30dbb8ae1 Add support for persist.sys.locale.
AndroidRuntime has been changed to read "ro.product.locale" and
"persist.sys.locale" instead of "ro.product.locale.language" etc.
This is passed down as "-Duser.locale" to the runtime.

The system_server has been changed to write out persist.sys.locale
on locale changes.

bug: 17691569

Change-Id: I93360c8795c9620a133656dc491d13d7b6ed162e
2015-01-22 13:48:20 +00:00
Jason Sams
c9870c145f Fix default compute thread priority
bug 16651474

Compute inherited graphics default thread priority of Display.  This
was not intended.

Change-Id: I0dd9a230ce8ceba64e971b024cbe518927cd2550
2015-01-21 16:12:37 -08:00
Robert Greenwalt
f19176ff2f Merge "Add + code handling logic for SMS Global Roaming" 2015-01-21 19:52:21 +00:00
Craig Mautner
247e828b5c Merge "[ActivityManager] No home activity resumed and cause key dispatch ANR" 2015-01-21 17:01:02 +00:00
Narayan Kamath
aa87e89e81 Merge "Choose the right executable for wrapped applications." 2015-01-21 14:01:57 +00:00
louis_chang
2d094e9477 [ActivityManager] No home activity resumed and cause
key dispatch ANR

Symptom:
In some scenario, there might have two home tasks
in the home stack. If the top home task was finishing
and expected to return to home stack, no activity
will resume.

Root Cause:
Unable to perform resumeHomeStackTask() because the
resumeTopActivityLocked() has been prevented to invoke
recursively.

Solution:
Just resume the next activity if already in home stack

Change-Id: I24ecbcac6cee4ddbd90cdd27c4f4915cffb9b354
2015-01-21 19:01:52 +08:00
Ying Wang
e4a031e3c3 Merge "New trick to install bad dex file." 2015-01-20 21:43:52 +00:00
Jason Sams
a5835a2e5f Add FP16 types to the list of RenderScript types.
Change-Id: Ibf9a6d391fb4d6a5c4b4e05ab73fb58bd74dc586
2015-01-20 12:51:14 -08:00
Ying Wang
b643624d2f New trick to install bad dex file.
Previously we use LOCAL_JAVA_RESOURCE_FILES to override the normally
generated classes.dex with a bad dex file.
Now as we have moved Java resource processing before running jarjar, dx
would fail for the bad classes.dex inside the classes.jar.
Instead we override the target specific variable PRIVATE_DEX_FILE to
inject the bad dex file.

(cherry-picked from commit f122d90c290c789e0d0085127beebdcf1935c127)

Bug: 18837479
Change-Id: I73f82c8a15e1d8935d9c2f290ba9456184a56ec7
2015-01-20 12:15:17 -08:00
Neil Fuller
42c2ac00e6 Merge "Fix for broken docs build." 2015-01-20 15:18:59 +00:00
Neil Fuller
ae69120b0f Fix for broken docs build.
Broken by commit 50a01d89606b40dd151ad407d05c3b2867bbdbad

Change-Id: Iab460aa6254d320349f67e747f763bbf06d3e9e7
2015-01-20 15:17:04 +00:00
Neil Fuller
00502e8960 Merge "Changes associated with an OkHttp upgrade" 2015-01-20 12:50:48 +00:00
Neil Fuller
50a01d8960 Changes associated with an OkHttp upgrade
Change-Id: I2a4db602aa7ffdef886e0f1a955715a2551a87a5
2015-01-20 11:59:24 +00:00
Narayan Kamath
37ad4b0242 Choose the right executable for wrapped applications.
64 bit zygotes should exec app_process64, whereas 32 bit
zygotes should exec app_process32.

Change-Id: I63b56400e0478cd2bb206c98da6858be558f0525
2015-01-19 16:09:17 +00:00
Narayan Kamath
d8beca64e0 Merge "Remove support for --classpath and make --runtime-init the default." 2015-01-19 15:09:17 +00:00
Narayan Kamath
f48029f00a Remove support for --classpath and make --runtime-init the default.
--classpath hasn't been properly supported or used for as long as
git history exists, and the non --runtime-init classpath is useless
without it.

Also, forking and exec' a bare dalvikvm instance from the zygote seems
somewhat pointless since we might as well just execute it directly.

Change-Id: Ib07d822d448e7b431d7564381f9cd11735fd1113
2015-01-19 15:04:58 +00:00
Narayan Kamath
e315feeaff Merge "Fix handling of wrapped processes [part 1]." 2015-01-19 15:00:00 +00:00
Narayan Kamath
6ac7e67168 Fix handling of wrapped processes [part 1].
Change 3fe595108f47fffd changed our pipe creation to CLOEXEC,
which doesn't work so well for wrapper processes that call exec.

Sending down the PID pre-exec won't work so well because wrappers
are arbitrary and might fork themselves before finally starting
the child application process.

Change-Id: I065f0f2150dc1ff04d2b2e8b25f06b4c754809b9
2015-01-19 14:17:49 +00:00
Narayan Kamath
4ac5775d63 Merge "Fix handling of wrapped processes [part 2]" 2015-01-19 09:52:21 +00:00
Chris Craik
ed35f5c788 Merge "Fast loadInverse() implementation for the common case" 2015-01-16 17:55:40 +00:00
Narayan Kamath
23e68780be Fix handling of wrapped processes [part 2]
Drop privileges only if we're root. Zygote.preloadClasses can
be called from a non-root uid / gid in the case of wrapped classes,
so we shouldn't die from the resulting EPERM.

Change-Id: Ie3fbe50a17ec49bcbcb875c3a2ee1e1a3a62e88d
2015-01-16 17:40:35 +00:00
Jean-Michel Trivi
6a64a9cd26 Merge "Prevent AudioService dead lock issue." 2015-01-16 17:23:36 +00:00
Alex Klyubin
0b486da650 Merge "Remove DSA support from Android KeyStore and KeyChain." 2015-01-16 16:44:22 +00:00
Alex Klyubin
590c068e83 Merge "Add KeyPairGenerator.EC backed by Android KeyStore." 2015-01-16 16:44:06 +00:00
Narayan Kamath
706f6cf383 Merge "Fix a property name that's longer than 31 chars." 2015-01-16 14:06:39 +00:00
Narayan Kamath
e5515772af Fix a property name that's longer than 31 chars.
The name wasn't chosen without much thought and is intended
to be a temporary fix to keep devices booting while a better
name is decided upon.

bug: 18335678
Change-Id: Ic3451255d870f3395cfbcaa08a7764d93defc350
2015-01-16 14:04:56 +00:00