159277 Commits

Author SHA1 Message Date
Marco Nelissen
06524dccbc Fix memory leak
Change-Id: Id691f9b32f9daeb23a01b17c5418b4d74a294cda
2015-02-10 15:45:23 -08:00
Calin Juravle
fd523efcde Merge "Get the instruction set that the libraries of secondary Abi is supported." 2015-02-10 16:13:30 +00:00
Jason Sams
2a3cdf57a4 Merge "Implement array types" 2015-02-09 22:58:13 +00:00
Neil Fuller
37e5a941ed Merge "Avoid static initialization of Layout from TextUtils" 2015-02-09 17:29:59 +00:00
Elliott Hughes
77a8f9d2de Merge "Remove obsolete 'numeric_date_template'." 2015-02-09 15:42:25 +00:00
Elliott Hughes
41ba04eed9 Remove obsolete 'numeric_date_template'.
The only caller was removed in f91f06a5991451e4af3cf99eba791cb3009810d2.

Bug: 18388178
Bug: 18322220
Change-Id: I222363186ad1b9e25c8d8bf0f3928e42cf9bd275
2015-02-06 18:18:06 -08:00
Jason Sams
46ba27e3fd Implement array types
Change-Id: I1b83f21ea2aeaa4b9f5934aadcb69d4a1c1fea20
2015-02-06 17:45:15 -08:00
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
Elliott Hughes
81b8431173 Merge "Fix clang build." 2015-02-06 05:37:33 +00:00
Elliott Hughes
7ff53fa0d4 Fix clang build.
Change-Id: If795820ef6431fee9c9c3862cc91ad4a9cc04507
2015-02-05 21:36:10 -08:00
Yang Ni
1269ff9610 Merge "Adds invocable functions to ScriptGroup" 2015-02-05 01:05:08 +00:00
Yang Ni
be392ad35e Adds invocable functions to ScriptGroup
This also includes InvokeID support

Change-Id: I5b59df166ea30b309b8dd9623825ac0e72d03856
2015-02-04 16:24:48 -08:00
Lorenzo Colitti
21702263d9 Merge "Add a unit test for StaticIpConfiguration." 2015-02-05 00:21:57 +00:00
Miao Wang
9a55cbc052 Merge "make Allocation.destroy() include setSurface(null) for USAGE_IO_OUTPUT (Native RS)" 2015-02-05 00:03:05 +00:00
John Reck
5ad36d4591 Merge "Fix ANR caused by hwuiTask thread" 2015-02-04 21:53:48 +00:00
Elliott Hughes
fd2c1307e6 Merge "Fix build." 2015-02-04 20:26:03 +00:00
Elliott Hughes
f953ca2ec8 Fix build.
Change-Id: Ic14b6de7e7e58ce42ae4cc5ca945e4896e3b7b8f
2015-02-04 12:24:21 -08:00
Christopher Ferris
4fb79d14bb Merge "Fix comment according to review." 2015-02-04 19:07:15 +00:00
Christopher Ferris
7254c123a1 Fix comment according to review.
Change-Id: I784f2051cd173425e9a9570ac4555cf835dd277d
2015-02-04 10:40:12 -08:00
Lorenzo Colitti
83faf72f84 Add a unit test for StaticIpConfiguration.
Change-Id: I68c735def8a242da0c8f95b7c5ea680ed902dab7
2015-02-04 17:28:35 +09:00
Miao Wang
f0f6e80bae make Allocation.destroy() include setSurface(null) for USAGE_IO_OUTPUT
(Native RS)

Change-Id: I23041da03c2c928ceec76037804abb5dc7e6eb64
2015-02-03 17:16:43 -08:00
Craig Mautner
53e8d6f934 Merge "[ActivityManager] Prevent application holding AMS lock" 2015-02-03 18:41:14 +00:00
Craig Mautner
240e874397 Merge "[ActivityManager] Set appropriate relation of task to home" 2015-02-03 17:54:27 +00:00
Craig Mautner
84533edfc0 Merge "Remove fall through for KEYCODE_VOICE_ASSIST" 2015-02-03 17:36:54 +00:00
Robert Greenwalt
deef702e60 Merge "Deutsche Telekom VVM free SMS shortcodes DE" 2015-02-03 16:44:02 +00:00
Henrik Baard
aa5c5e31de Remove fall through for KEYCODE_VOICE_ASSIST
Removing unintentional fallthrough for the case
KEYCODE_VOICE_ASSIST.

The code works today since KEYCODE_VOICE_ASSIST is the
last case in the switch statement, however it is bad
practice. If somone adds another case statement the
code will break.

Change-Id: Iee6234807bbe176bd94e2584de288105d6c6a7cb
2015-02-03 09:25:28 +01:00
Yang Ni
9559ce7c1b Merge "Pass in code cache directory when creating a script group." 2015-02-03 06:20:20 +00:00
Robert Greenwalt
fabf0e0ba8 Merge "Fixing up the formatting code which is already merged" 2015-02-02 17:00:43 +00:00
Robert Greenwalt
3c6e38d3b5 Fixing up the formatting code which is already merged
I just apply google coding guide like space.

Uploading the same code about + handling just apply the Google Coding Guide.
The previous code is "https://android-review.googlesource.com/#/c/122770/"

This code is about + plus number converting logic for international NANP.

Change-Id: I23e4709294c603b387b28b3c2a56c932d838c666
2015-02-02 15:04:56 +09: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
Yang Ni
ebf63408d2 Pass in code cache directory when creating a script group.
Change-Id: Ia73ea917a126a5055ec97f13d90a5feaafd6a2f5
2015-01-29 08:46:46 -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