118045 Commits

Author SHA1 Message Date
Elliott Hughes
29d60b95fa am 8d41e653: Merge "Miscellaneous small documentation fixes."
* commit '8d41e653bae240488281d430309e2d501e9524e5':
  Miscellaneous small documentation fixes.
2014-02-21 09:25:50 -08:00
Elliott Hughes
8d41e653ba Merge "Miscellaneous small documentation fixes." 2014-02-21 17:19:21 +00:00
Narayan Kamath
911b2ce3da am 4a642ee5: Merge "Remove unused JNITest class"
* commit '4a642ee5e65ca47ecf6cb274096162e580aac922':
  Remove unused JNITest class
2014-02-21 08:34:36 -08:00
Narayan Kamath
1925634079 am 22c66639: Merge "Fixes for 64bit in libhwui"
* commit '22c66639093a634b5688372d261d003b0478c450':
  Fixes for 64bit in libhwui
2014-02-21 08:34:30 -08:00
Narayan Kamath
4a642ee5e6 Merge "Remove unused JNITest class" 2014-02-21 15:02:31 +00:00
Ashok Bhat
42f06b0e22 Remove unused JNITest class
JNITest class is no longer actively used. This patch
removes the class (java and jni) files.

JNI interfaces and calls are extensively tested in
the art unit tests (art/tests) and in cts (see
CtsJniTestCases).

Change-Id: I62f7c72deb5d206fa3f545ae39a9cb9011110d0a
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
2014-02-21 14:34:35 +00:00
Narayan Kamath
22c6663909 Merge "Fixes for 64bit in libhwui" 2014-02-21 14:23:57 +00:00
Kévin PETIT
73fc558e44 Fixes for 64bit in libhwui
Using reinterpret_cast allows conversions between pointer types
and integers which don't have the same size. The corresponding
flags is -Wint-to-pointer-cast.

Change-Id: I8ff0c79d235fa6d07b8d9305edc185d946d5133d
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
2014-02-21 13:07:29 +00:00
Narayan Kamath
fca204a4b8 am 05cebdc2: Merge "Fix several bad function definitions."
* commit '05cebdc2abd05b0dca351306cb039245d50c67ae':
  Fix several bad function definitions.
2014-02-20 04:58:52 -08:00
Narayan Kamath
b152473f46 am 9fce8535: Merge "AArch64: Make AssetAtlasService 64-bit compatible"
* commit '9fce8535851fc696997bd3c251d00e34179d6482':
  AArch64: Make AssetAtlasService 64-bit compatible
2014-02-20 04:58:45 -08:00
Narayan Kamath
05cebdc2ab Merge "Fix several bad function definitions." 2014-02-20 12:55:27 +00:00
Narayan Kamath
9fce853585 Merge "AArch64: Make AssetAtlasService 64-bit compatible" 2014-02-20 12:55:20 +00:00
Narayan Kamath
047b938f71 Fix several bad function definitions.
We claim these functions want jlong as input (8 bytes wide)
but the definitions use pointer types or jints
(4 bytes wide for 32 bit).

bug: 12890271

(cherry picked from 017546e65280a3389b6167f5fc3b5d1c3001154a)

Change-Id: Iede02be90e6a3c9a2db1fe04dcd0db99abe37097
2014-02-20 12:52:16 +00:00
Ashok Bhat
4de3f481bc AArch64: Make AssetAtlasService 64-bit compatible
Changes in this patch include

[x] Long(64-bit) is used to store native pointers in
    AssetAtlasService and related classes as they can be 64-bit.

[x] Some minor changes have been done to conform with
    standard JNI practice (e.g. use of jint instead of int
    in JNI function prototypes)

Change-Id: Ib4c77c134e3ad5b21732e20cde9a54a0b16bdab1
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
2014-02-20 12:10:24 +00:00
Narayan Kamath
128599e449 am 2b3c14bf: Merge "libandroidfw: fix build error for 64-bit"
* commit '2b3c14bf75c71524a0fcbc3e9d1fdab9aa6c3473':
  libandroidfw: fix build error for 64-bit
2014-02-20 03:53:36 -08:00
Narayan Kamath
2b3c14bf75 Merge "libandroidfw: fix build error for 64-bit" 2014-02-20 11:50:59 +00:00
Patrik Bannura
443dd9313f libandroidfw: fix build error for 64-bit
Fixed casting int to pointer in logging code.
Previously ints where printed as pointers and
the %p format specifier was used for convenience
to get hex output. This change uses %x and also
gets rid of the casts.

Change-Id: Ia2539769d245f50c0f3884119f80682defe69d61
2014-02-20 10:06:23 +00:00
Craig Mautner
23ef1b5e0b am 16ea3e6a: Merge "A background started service is removed from mStartingBackground when timeout. Fix is to make sure mStartingBackground is updated to remove one."
* commit '16ea3e6a5b37dc436d1089996004bcae12f5e3b0':
  A background started service is removed from mStartingBackground when timeout. Fix is to make sure mStartingBackground is updated to remove one.
2014-02-19 08:26:15 -08:00
Narayan Kamath
96ddea413d am 7c710936: Merge "Remove java.io.tmpdir assignment in AndroidRuntime."
* commit '7c710936c5129664f8b23bf4592c12eca975d229':
  Remove java.io.tmpdir assignment in AndroidRuntime.
2014-02-19 08:26:07 -08:00
Craig Mautner
16ea3e6a5b Merge "A background started service is removed from mStartingBackground when timeout. Fix is to make sure mStartingBackground is updated to remove one." 2014-02-19 15:36:01 +00:00
Narayan Kamath
7c710936c5 Merge "Remove java.io.tmpdir assignment in AndroidRuntime." 2014-02-19 14:24:48 +00:00
Calin Juravle
7a4172d190 am f11cc165: Merge "Fixed a possible infinite loop in JsonReader#skipValue()"
* commit 'f11cc165f4d6e18d79ce013fa2f74fb43e002ac1':
  Fixed a possible infinite loop in JsonReader#skipValue()
2014-02-19 03:18:06 -08:00
Calin Juravle
f11cc165f4 Merge "Fixed a possible infinite loop in JsonReader#skipValue()" 2014-02-19 11:15:00 +00:00
Junu Kim
fcb87369b1 A background started service is removed from mStartingBackground when timeout.
Fix is to make sure mStartingBackground is updated to remove one.

Change-Id: I0e42beb550d33e6e400349b85bbb89848e18d520
2014-02-19 16:25:21 +09:00
Calin Juravle
8fbcc6b4cd Fixed a possible infinite loop in JsonReader#skipValue()
Bug: https://code.google.com/p/android/issues/detail?id=65846

Change-Id: Idaa0e75fc5612550c4b9ccb9afa5535ea5b189df
2014-02-18 19:19:15 +00:00
Jeff Sharkey
660a514e80 am 60097a9c: Merge "Structure device not freed in error case"
* commit '60097a9c5a7214cb73d0bc966adef767743f8798':
  Structure device not freed in error case
2014-02-18 09:16:31 -08:00
Jeff Sharkey
df47ecaa09 am 02a64dae: Merge "Tethering: Skip link local addresses when enabling NAT"
* commit '02a64daefece8ccdc40935c7bc865a8966249c44':
  Tethering: Skip link local addresses when enabling NAT
2014-02-18 09:13:00 -08:00
Jeff Sharkey
e6d256c50b am 234b0b03: Merge "Fix, MountService now only sends one onShutDownComplete"
* commit '234b0b037ee1f8dc50c846279216a8e4d779ff56':
  Fix, MountService now only sends one onShutDownComplete
2014-02-18 09:12:57 -08:00
Jeff Sharkey
60097a9c5a Merge "Structure device not freed in error case" 2014-02-18 17:12:14 +00:00
Jeff Sharkey
02a64daefe Merge "Tethering: Skip link local addresses when enabling NAT" 2014-02-18 17:11:10 +00:00
Jeff Sharkey
234b0b037e Merge "Fix, MountService now only sends one onShutDownComplete" 2014-02-18 17:10:02 +00:00
Narayan Kamath
92a09fbdeb am a14d9c31: Merge "Move Json{Reader,Writer} test to cts."
* commit 'a14d9c318a1d358902a76aff733303c5509bb5fc':
  Move Json{Reader,Writer} test to cts.
2014-02-17 10:23:56 -08:00
Narayan Kamath
a14d9c318a Merge "Move Json{Reader,Writer} test to cts." 2014-02-17 18:20:34 +00:00
Narayan Kamath
94ccb6bf95 Move Json{Reader,Writer} test to cts.
These tests aren't really run automatically (or perhaps
even manually) in their present location, and increasing
CTS coverage is never a bad thing.

Change-Id: I81cce1211021011dca551fde62e725e177ca4df0
2014-02-17 17:51:43 +00:00
Narayan Kamath
28879bbfe8 am be57fca4: Merge "Extended locales in AAPT / AssetManager."
* commit 'be57fca41a731217010d9f92554cf48708b06ecf':
  Extended locales in AAPT / AssetManager.
2014-02-17 03:03:49 -08:00
Narayan Kamath
183e5e038b am 49024bac: Merge "AssetManager support for 3 letter lang/country codes."
* commit '49024bacf63db39467e7f318c682ad771ec0de22':
  AssetManager support for 3 letter lang/country codes.
2014-02-17 03:03:46 -08:00
Narayan Kamath
be57fca41a Merge "Extended locales in AAPT / AssetManager." 2014-02-17 11:00:30 +00:00
Narayan Kamath
49024bacf6 Merge "AssetManager support for 3 letter lang/country codes." 2014-02-17 11:00:15 +00:00
Tim Murray
4870c813fe am 7d1a6c5c: Merge "Fix destruction issues relating to AllocationAdapter."
* commit '7d1a6c5cac16795e5953d2b4d34671e34e907632':
  Fix destruction issues relating to AllocationAdapter.
2014-02-14 15:53:59 -08:00
Tim Murray
7d1a6c5cac Merge "Fix destruction issues relating to AllocationAdapter." 2014-02-14 23:50:08 +00:00
Tim Murray
6d63c84f44 Fix destruction issues relating to AllocationAdapter.
bug 12971201

Change-Id: I3d9f66f527a35837ac866a695bdcc41d908a2562
2014-02-14 15:48:03 -08:00
Ben Gruver
da37944785 am 509a243c: Merge "Check the return value of listFiles on the ifw directory"
* commit '509a243c2c5ebc9cc55324bd9a03a5b560d81cfb':
  Check the return value of listFiles on the ifw directory
2014-02-14 13:57:24 -08:00
Ben Gruver
509a243c2c Merge "Check the return value of listFiles on the ifw directory" 2014-02-14 21:15:50 +00:00
Ben Gruver
26c6b783d2 Check the return value of listFiles on the ifw directory
listFiles can return null if the directory doesn't exist

Bug: 10497143
Change-Id: Ie4cbdf18a259a9641669a4e6b9bf49b4879acc67
2014-02-14 13:07:11 -08:00
Tim Murray
b25a6936a1 am d7043f00: Merge "Add hidden minor version ID for support lib workarounds."
* commit 'd7043f0084237200b6aab5d101c8ab6d3ab495c6':
  Add hidden minor version ID for support lib workarounds.
2014-02-14 12:51:32 -08:00
Tim Murray
d7043f0084 Merge "Add hidden minor version ID for support lib workarounds." 2014-02-14 20:47:34 +00:00
Narayan Kamath
3d03e5b90d Remove java.io.tmpdir assignment in AndroidRuntime.
This value is overridden by the framework anyway
(see ActivityThread.handleBindApplication). Besides,
it doesn't seem like a great idea to let tools clutter
/sdcard/ with temp files.

Change-Id: I26c710cbea7397f89e6103e54a73044a87da95b1
2014-02-14 17:42:24 +00:00
Narayan Kamath
788fa41482 Extended locales in AAPT / AssetManager.
Support 3 letter language codes, script codes &
variants. The bulk of the changes are related to
the implementation of command line filtering of
locales etc. The previous code assumed that the
value of each "axis" (locale, density, size etc.)
could be represented by a 4 byte type. This is
no longer the case.

This change introduces a new class, AaptLocaleValue
which holds a (normalized) locale parsed from a
directory name or a filter string. This class takes
responsibility for parsing locales as well as
writing them to ResTable_config structures, which is
their representation in the resource table.

This includes minor changes at the java / JNI level
for AssetManager. We now call locale.toLanguageTag()
to give the native layer a well formed BCP-47 tag.
I've removed some duplicated parsing code in
AssetManager.cpp and replaced them with functions on
ResTable_config. The native getLocales function has
been changed to return well formed BCP-47 locales as
well, so that the corresponding java function can use
Locale.forLanguageTag to construct a Locale object
out of it.

Finally, this change introduces default and copy
constructors for ResTable_config to prevent having
to memset() the associated memory to 0 on every
stack allocation.

(cherry-picked from commit 91447d88f2bdf9c2bf8d1a53570efef6172fba74)

Change-Id: I1b43086860661012f949fb8e5deb7df44519b854
2014-02-14 14:08:57 +00:00
Narayan Kamath
48620f1d1b AssetManager support for 3 letter lang/country codes.
- 3 letter codes are packed into the existing 32 bit locale
  field in ResTable_config
- We introduce new fields for script / variant information.

Note that we define a "match" between two ResTable_config
structures to be purely on the basis of their language &
country (disregarding the script and the variant). However,
configs with scripts and variants are considered to be more
specific than those without.

(cherry picked from commit 378c6775a62d9c461cde51f06c1b14bb014c78fd)

Change-Id: I7dce82a3fe2412834252723f458826ae41535a78
2014-02-14 14:08:23 +00:00
Narayan Kamath
3bec0fbb34 am fa8f95e9: Merge "AArch64: Use long for pointers in SurfaceSession class"
* commit 'fa8f95e9b96e3a12e98269c8a31ed34df6a323ca':
  AArch64: Use long for pointers in SurfaceSession class
2014-02-14 05:14:07 -08:00