OSDN Git Service
Deepanshu Gupta [Thu, 20 Feb 2014 17:53:17 +0000 (17:53 +0000)]
am
65521c3c: am
ca4b9a77: am
e92c8542: am
01825b7a: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
* commit '
65521c3cf169808cd02ce09a7344bc633d51c1fc':
Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 20 Feb 2014 17:49:27 +0000 (17:49 +0000)]
am
ca4b9a77: am
e92c8542: am
01825b7a: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
* commit '
ca4b9a77e7d20703287b33b203b2582bd43f7792':
Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 20 Feb 2014 17:46:02 +0000 (17:46 +0000)]
am
e92c8542: am
01825b7a: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
* commit '
e92c8542a5cf1160a1b701b9f176af64ba46d68d':
Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 20 Feb 2014 17:42:54 +0000 (17:42 +0000)]
am
01825b7a: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
* commit '
01825b7aa3c864426c78c08c2f6004a8362c2b47':
Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
Justin Koh [Thu, 20 Feb 2014 17:41:31 +0000 (17:41 +0000)]
am
744d3473: Merge "Add hardware feature describing a watch." into klp-modular-dev
* commit '
744d3473f8a0f9f95e3fdf83670faf6d1551839e':
Add hardware feature describing a watch.
Justin Koh [Thu, 20 Feb 2014 17:38:03 +0000 (17:38 +0000)]
Merge "Add hardware feature describing a watch." into klp-modular-dev
Narayan Kamath [Thu, 20 Feb 2014 13:02:25 +0000 (13:02 +0000)]
am
fca204a4: am
05cebdc2: Merge "Fix several bad function definitions."
* commit '
fca204a4b8771b800383c91465a48eb2cd8b3ba2':
Fix several bad function definitions.
Narayan Kamath [Thu, 20 Feb 2014 13:02:21 +0000 (13:02 +0000)]
am
b152473f: am
9fce8535: Merge "AArch64: Make AssetAtlasService 64-bit compatible"
* commit '
b152473f46d8176e7eb2c55b54342a7a29c525cf':
AArch64: Make AssetAtlasService 64-bit compatible
Narayan Kamath [Thu, 20 Feb 2014 12:58:52 +0000 (04:58 -0800)]
am
05cebdc2: Merge "Fix several bad function definitions."
* commit '
05cebdc2abd05b0dca351306cb039245d50c67ae':
Fix several bad function definitions.
Narayan Kamath [Thu, 20 Feb 2014 12:58:45 +0000 (04:58 -0800)]
am
9fce8535: Merge "AArch64: Make AssetAtlasService 64-bit compatible"
* commit '
9fce8535851fc696997bd3c251d00e34179d6482':
AArch64: Make AssetAtlasService 64-bit compatible
Narayan Kamath [Thu, 20 Feb 2014 12:55:27 +0000 (12:55 +0000)]
Merge "Fix several bad function definitions."
Narayan Kamath [Thu, 20 Feb 2014 12:55:20 +0000 (12:55 +0000)]
Merge "AArch64: Make AssetAtlasService 64-bit compatible"
Narayan Kamath [Thu, 6 Feb 2014 11:50:31 +0000 (11:50 +0000)]
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
Ashok Bhat [Mon, 27 Jan 2014 16:00:23 +0000 (16:00 +0000)]
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>
Narayan Kamath [Thu, 20 Feb 2014 11:57:19 +0000 (11:57 +0000)]
am
128599e4: am
2b3c14bf: Merge "libandroidfw: fix build error for 64-bit"
* commit '
128599e4496bd7ceb9d70f4addde0eba65103709':
libandroidfw: fix build error for 64-bit
Narayan Kamath [Thu, 20 Feb 2014 11:53:36 +0000 (03:53 -0800)]
am
2b3c14bf: Merge "libandroidfw: fix build error for 64-bit"
* commit '
2b3c14bf75c71524a0fcbc3e9d1fdab9aa6c3473':
libandroidfw: fix build error for 64-bit
Narayan Kamath [Thu, 20 Feb 2014 11:50:59 +0000 (11:50 +0000)]
Merge "libandroidfw: fix build error for 64-bit"
Patrik Bannura [Wed, 12 Feb 2014 12:38:54 +0000 (13:38 +0100)]
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
Scott Main [Thu, 20 Feb 2014 02:25:57 +0000 (02:25 +0000)]
am
d43ad2f3: am
4c68c4ed: am
24a8e1d0: am
af87e19b: Merge "update intent examples for maps bug:
12661490 bug:
12957723" into klp-docs
* commit '
d43ad2f35abcc647f7985abd09ed9de5899faf18':
update intent examples for maps bug:
12661490 bug:
12957723
Scott Main [Thu, 20 Feb 2014 02:23:52 +0000 (02:23 +0000)]
am
4c68c4ed: am
24a8e1d0: am
af87e19b: Merge "update intent examples for maps bug:
12661490 bug:
12957723" into klp-docs
* commit '
4c68c4ed463f7f83d05f86ed11046195829028ed':
update intent examples for maps bug:
12661490 bug:
12957723
Scott Main [Thu, 20 Feb 2014 02:20:30 +0000 (02:20 +0000)]
am
24a8e1d0: am
af87e19b: Merge "update intent examples for maps bug:
12661490 bug:
12957723" into klp-docs
* commit '
24a8e1d0e9a32c571403bfc730ce18dd138a529c':
update intent examples for maps bug:
12661490 bug:
12957723
Scott Main [Thu, 20 Feb 2014 02:17:20 +0000 (02:17 +0000)]
am
af87e19b: Merge "update intent examples for maps bug:
12661490 bug:
12957723" into klp-docs
* commit '
af87e19bdbf6b16240dcdbfd31fe4f33eca4e51d':
update intent examples for maps bug:
12661490 bug:
12957723
Scott Main [Thu, 20 Feb 2014 02:14:40 +0000 (02:14 +0000)]
Merge "update intent examples for maps bug:
12661490 bug:
12957723" into klp-docs
Scott Main [Sat, 15 Feb 2014 02:37:24 +0000 (18:37 -0800)]
update intent examples for maps
bug:
12661490
bug:
12957723
Change-Id: Ice25ef430901b155c00d59402c5f9f50dcb48390
Deepanshu Gupta [Wed, 19 Feb 2014 18:53:27 +0000 (10:53 -0800)]
Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
For these font families, text was always rendered as italic. This
changeset fixes the issue.
Bug: http://b.android.com/57221
Change-Id: Ic8a299bd1e555f5bb914cd3d2fe72917ec7f471a
(cherry picked from commit
e327212adde1136807bbdf052e8cc3861f8a6aba)
Adam Lesinski [Wed, 19 Feb 2014 19:41:26 +0000 (19:41 +0000)]
am
4b07b26e: Merge "Make UsbService optional" into klp-modular-dev
* commit '
4b07b26e8654df52ca80bb2165ebdf9352ab9337':
Make UsbService optional
Adam Lesinski [Wed, 19 Feb 2014 19:41:23 +0000 (19:41 +0000)]
am
6feaa267: Merge "Add fastpath for single signature comparison" into klp-modular-dev
* commit '
6feaa267a585f22595f846c9e3d09a76dc3db47a':
Add fastpath for single signature comparison
Adam Lesinski [Wed, 19 Feb 2014 19:38:33 +0000 (19:38 +0000)]
Merge "Make UsbService optional" into klp-modular-dev
Adam Lesinski [Wed, 19 Feb 2014 19:38:17 +0000 (19:38 +0000)]
Merge "Add fastpath for single signature comparison" into klp-modular-dev
Craig Mautner [Wed, 19 Feb 2014 16:29:01 +0000 (16:29 +0000)]
am
23ef1b5e: 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 '
23ef1b5e0b84e3bb726454b97846f91f2efad212':
A background started service is removed from mStartingBackground when timeout. Fix is to make sure mStartingBackground is updated to remove one.
Narayan Kamath [Wed, 19 Feb 2014 16:28:56 +0000 (16:28 +0000)]
am
96ddea41: am
7c710936: Merge "Remove java.io.tmpdir assignment in AndroidRuntime."
* commit '
96ddea413dcf266d996877d3fc2d81738c5316c8':
Remove java.io.tmpdir assignment in AndroidRuntime.
Craig Mautner [Wed, 19 Feb 2014 16:26:15 +0000 (08:26 -0800)]
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.
Narayan Kamath [Wed, 19 Feb 2014 16:26:07 +0000 (08:26 -0800)]
am
7c710936: Merge "Remove java.io.tmpdir assignment in AndroidRuntime."
* commit '
7c710936c5129664f8b23bf4592c12eca975d229':
Remove java.io.tmpdir assignment in AndroidRuntime.
Craig Mautner [Wed, 19 Feb 2014 15:36:00 +0000 (15:36 +0000)]
Merge "A background started service is removed from mStartingBackground when timeout. Fix is to make sure mStartingBackground is updated to remove one."
Narayan Kamath [Wed, 19 Feb 2014 14:24:47 +0000 (14:24 +0000)]
Merge "Remove java.io.tmpdir assignment in AndroidRuntime."
John Spurlock [Wed, 19 Feb 2014 13:54:13 +0000 (13:54 +0000)]
am
469301f7: am
9dd87081: am
99873565: am
ba231fca: Fix bad @links in PendingIntent.java
* commit '
469301f7edf2201fdbac217fb0ae49652fa9466c':
Fix bad @links in PendingIntent.java
John Spurlock [Wed, 19 Feb 2014 13:51:00 +0000 (13:51 +0000)]
am
9dd87081: am
99873565: am
ba231fca: Fix bad @links in PendingIntent.java
* commit '
9dd87081e4bea9cd48db35fa82b3adeda37a34b5':
Fix bad @links in PendingIntent.java
John Spurlock [Wed, 19 Feb 2014 13:47:52 +0000 (13:47 +0000)]
am
99873565: am
ba231fca: Fix bad @links in PendingIntent.java
* commit '
998735652d2449e3ccbac7686b71bf40dca06e94':
Fix bad @links in PendingIntent.java
John Spurlock [Wed, 19 Feb 2014 13:44:14 +0000 (13:44 +0000)]
am
ba231fca: Fix bad @links in PendingIntent.java
* commit '
ba231fcabfdf8f8bd72dbb428b8d35ae14a1a14d':
Fix bad @links in PendingIntent.java
Calin Juravle [Wed, 19 Feb 2014 11:21:58 +0000 (11:21 +0000)]
am
7a4172d1: am
f11cc165: Merge "Fixed a possible infinite loop in JsonReader#skipValue()"
* commit '
7a4172d190871c6b17124bf86374304cef727984':
Fixed a possible infinite loop in JsonReader#skipValue()
Calin Juravle [Wed, 19 Feb 2014 11:18:06 +0000 (03:18 -0800)]
am
f11cc165: Merge "Fixed a possible infinite loop in JsonReader#skipValue()"
* commit '
f11cc165f4d6e18d79ce013fa2f74fb43e002ac1':
Fixed a possible infinite loop in JsonReader#skipValue()
Calin Juravle [Wed, 19 Feb 2014 11:15:00 +0000 (11:15 +0000)]
Merge "Fixed a possible infinite loop in JsonReader#skipValue()"
Junu Kim [Wed, 19 Feb 2014 07:25:21 +0000 (16:25 +0900)]
A background started service is removed from mStartingBackground when timeout.
Fix is to make sure mStartingBackground is updated to remove one.
Change-Id: I0e42beb550d33e6e400349b85bbb89848e18d520
Justin Koh [Fri, 14 Feb 2014 00:06:59 +0000 (16:06 -0800)]
Add hardware feature describing a watch.
Add hardware feature describing a watch so that hardware can specify that
it is a device that is worn on the body (perhaps the wrist).
Change-Id: I9d4cb7e86067f6ad41b39bcc545222b3b0fbf890
Craig Mautner [Tue, 18 Feb 2014 23:59:42 +0000 (23:59 +0000)]
am
db0f3e82: Merge "Allow "opaque" flag to be updated. DO NOT MERGE" into klp-modular-dev
* commit '
db0f3e825fb4da01f887c41a877708734b0899e3':
Allow "opaque" flag to be updated. DO NOT MERGE
Craig Mautner [Tue, 18 Feb 2014 23:56:53 +0000 (23:56 +0000)]
Merge "Allow "opaque" flag to be updated. DO NOT MERGE" into klp-modular-dev
Andy McFadden [Thu, 30 Jan 2014 01:18:05 +0000 (17:18 -0800)]
Allow "opaque" flag to be updated. DO NOT MERGE
Added a setOpaque() call and a bunch of comments.
Bug
12387406
Change-Id: Ic066cba926223f22f9bc56a7013987001d9cc795
Adam Lesinski [Tue, 18 Feb 2014 23:21:13 +0000 (15:21 -0800)]
Add fastpath for single signature comparison
PackageManager does not need to create a hash set
when comparing two sets of signatures, where each set
contains one signature. This is the common case for
most applications.
Bug:
13029313
Change-Id: I61883d85960db7b376e234d7abae6149c4d20245
Adam Lesinski [Tue, 18 Feb 2014 22:57:37 +0000 (22:57 +0000)]
am
3d9bcb90: Create FEATURE_ constants for print and backup
* commit '
3d9bcb90ee6c0ffff93642539ae64fb672c7f14a':
Create FEATURE_ constants for print and backup
Adam Lesinski [Sat, 15 Feb 2014 01:19:56 +0000 (17:19 -0800)]
Make UsbService optional
Tweaked the services Android.mk to build dependencies
when building with mm[m].
Change-Id: I6dad511c652bcacc085f27ede5f8f22a6982c6bd
Adam Lesinski [Tue, 18 Feb 2014 22:05:14 +0000 (14:05 -0800)]
Create FEATURE_ constants for print and backup
Bug:
13079822
Change-Id: I6f4b759951d45989e8aad4011fae431ee2ecae0c
Calin Juravle [Tue, 18 Feb 2014 19:08:39 +0000 (19:08 +0000)]
Fixed a possible infinite loop in JsonReader#skipValue()
Bug: https://code.google.com/p/android/issues/detail?id=65846
Change-Id: Idaa0e75fc5612550c4b9ccb9afa5535ea5b189df
John Spurlock [Tue, 18 Feb 2014 18:19:57 +0000 (13:19 -0500)]
Fix bad @links in PendingIntent.java
Change-Id: I0a0014e17907f5cf16c3536a99e41efa9dafc963
Jeff Sharkey [Tue, 18 Feb 2014 17:19:38 +0000 (17:19 +0000)]
am
660a514e: am
60097a9c: Merge "Structure device not freed in error case"
* commit '
660a514e80e0019d8c6632e84bd03491722fc2ab':
Structure device not freed in error case
Jeff Sharkey [Tue, 18 Feb 2014 17:16:31 +0000 (09:16 -0800)]
am
60097a9c: Merge "Structure device not freed in error case"
* commit '
60097a9c5a7214cb73d0bc966adef767743f8798':
Structure device not freed in error case
Jeff Sharkey [Tue, 18 Feb 2014 17:15:44 +0000 (17:15 +0000)]
am
df47ecaa: am
02a64dae: Merge "Tethering: Skip link local addresses when enabling NAT"
* commit '
df47ecaa0973b80c9b97ef9ed3ad7abcfef361c7':
Tethering: Skip link local addresses when enabling NAT
Jeff Sharkey [Tue, 18 Feb 2014 17:15:39 +0000 (17:15 +0000)]
am
e6d256c5: am
234b0b03: Merge "Fix, MountService now only sends one onShutDownComplete"
* commit '
e6d256c50b0709378a5bfff0ae27eb7cf6cc3894':
Fix, MountService now only sends one onShutDownComplete
Jeff Sharkey [Tue, 18 Feb 2014 17:13:00 +0000 (09:13 -0800)]
am
02a64dae: Merge "Tethering: Skip link local addresses when enabling NAT"
* commit '
02a64daefece8ccdc40935c7bc865a8966249c44':
Tethering: Skip link local addresses when enabling NAT
Jeff Sharkey [Tue, 18 Feb 2014 17:12:57 +0000 (09:12 -0800)]
am
234b0b03: Merge "Fix, MountService now only sends one onShutDownComplete"
* commit '
234b0b037ee1f8dc50c846279216a8e4d779ff56':
Fix, MountService now only sends one onShutDownComplete
Jeff Sharkey [Tue, 18 Feb 2014 17:12:14 +0000 (17:12 +0000)]
Merge "Structure device not freed in error case"
Jeff Sharkey [Tue, 18 Feb 2014 17:11:09 +0000 (17:11 +0000)]
Merge "Tethering: Skip link local addresses when enabling NAT"
Jeff Sharkey [Tue, 18 Feb 2014 17:10:02 +0000 (17:10 +0000)]
Merge "Fix, MountService now only sends one onShutDownComplete"
Narayan Kamath [Mon, 17 Feb 2014 18:27:13 +0000 (18:27 +0000)]
am
92a09fbd: am
a14d9c31: Merge "Move Json{Reader,Writer} test to cts."
* commit '
92a09fbdebae5362633db281bc155ed1f1145588':
Move Json{Reader,Writer} test to cts.
Narayan Kamath [Mon, 17 Feb 2014 18:23:56 +0000 (10:23 -0800)]
am
a14d9c31: Merge "Move Json{Reader,Writer} test to cts."
* commit '
a14d9c318a1d358902a76aff733303c5509bb5fc':
Move Json{Reader,Writer} test to cts.
Narayan Kamath [Mon, 17 Feb 2014 18:20:33 +0000 (18:20 +0000)]
Merge "Move Json{Reader,Writer} test to cts."
Narayan Kamath [Mon, 17 Feb 2014 17:51:43 +0000 (17:51 +0000)]
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
Narayan Kamath [Mon, 17 Feb 2014 11:06:38 +0000 (11:06 +0000)]
am
28879bbf: am
be57fca4: Merge "Extended locales in AAPT / AssetManager."
* commit '
28879bbfe89dc4bf2067a7183975ecffb82f68e6':
Extended locales in AAPT / AssetManager.
Narayan Kamath [Mon, 17 Feb 2014 11:06:31 +0000 (11:06 +0000)]
am
183e5e03: am
49024bac: Merge "AssetManager support for 3 letter lang/country codes."
* commit '
183e5e038bd844ac415b14f22df5c476732066c8':
AssetManager support for 3 letter lang/country codes.
Narayan Kamath [Mon, 17 Feb 2014 11:03:49 +0000 (03:03 -0800)]
am
be57fca4: Merge "Extended locales in AAPT / AssetManager."
* commit '
be57fca41a731217010d9f92554cf48708b06ecf':
Extended locales in AAPT / AssetManager.
Narayan Kamath [Mon, 17 Feb 2014 11:03:46 +0000 (03:03 -0800)]
am
49024bac: Merge "AssetManager support for 3 letter lang/country codes."
* commit '
49024bacf63db39467e7f318c682ad771ec0de22':
AssetManager support for 3 letter lang/country codes.
Narayan Kamath [Mon, 17 Feb 2014 11:00:29 +0000 (11:00 +0000)]
Merge "Extended locales in AAPT / AssetManager."
Narayan Kamath [Mon, 17 Feb 2014 11:00:14 +0000 (11:00 +0000)]
Merge "AssetManager support for 3 letter lang/country codes."
Tim Murray [Fri, 14 Feb 2014 23:56:57 +0000 (23:56 +0000)]
am
4870c813: am
7d1a6c5c: Merge "Fix destruction issues relating to AllocationAdapter."
* commit '
4870c813fe4a6fc7a176f22b5e7f96e9f7a4e469':
Fix destruction issues relating to AllocationAdapter.
Tim Murray [Fri, 14 Feb 2014 23:53:59 +0000 (15:53 -0800)]
am
7d1a6c5c: Merge "Fix destruction issues relating to AllocationAdapter."
* commit '
7d1a6c5cac16795e5953d2b4d34671e34e907632':
Fix destruction issues relating to AllocationAdapter.
Tim Murray [Fri, 14 Feb 2014 23:50:08 +0000 (23:50 +0000)]
Merge "Fix destruction issues relating to AllocationAdapter."
Tim Murray [Wed, 12 Feb 2014 19:16:17 +0000 (11:16 -0800)]
Fix destruction issues relating to AllocationAdapter.
bug
12971201
Change-Id: I3d9f66f527a35837ac866a695bdcc41d908a2562
Ben Gruver [Fri, 14 Feb 2014 23:08:10 +0000 (23:08 +0000)]
am
da379447: am
509a243c: Merge "Check the return value of listFiles on the ifw directory"
* commit '
da37944785c47b2b92c1a0f79c5d602256859fe6':
Check the return value of listFiles on the ifw directory
Tim Murray [Fri, 14 Feb 2014 23:08:01 +0000 (23:08 +0000)]
am
b25a6936: am
d7043f00: Merge "Add hidden minor version ID for support lib workarounds."
* commit '
b25a6936a1b0dbabaf8ad8c2ce59e7251daa9e8c':
Add hidden minor version ID for support lib workarounds.
Ben Gruver [Fri, 14 Feb 2014 21:57:24 +0000 (13:57 -0800)]
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
Ben Gruver [Fri, 14 Feb 2014 21:15:49 +0000 (21:15 +0000)]
Merge "Check the return value of listFiles on the ifw directory"
Ben Gruver [Tue, 1 Oct 2013 00:03:34 +0000 (17:03 -0700)]
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
Tim Murray [Fri, 14 Feb 2014 20:51:32 +0000 (12:51 -0800)]
am
d7043f00: Merge "Add hidden minor version ID for support lib workarounds."
* commit '
d7043f0084237200b6aab5d101c8ab6d3ab495c6':
Add hidden minor version ID for support lib workarounds.
Tim Murray [Fri, 14 Feb 2014 20:47:33 +0000 (20:47 +0000)]
Merge "Add hidden minor version ID for support lib workarounds."
Narayan Kamath [Fri, 14 Feb 2014 17:14:09 +0000 (17:14 +0000)]
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
Narayan Kamath [Tue, 21 Jan 2014 15:32:36 +0000 (15:32 +0000)]
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
Narayan Kamath [Mon, 20 Jan 2014 13:57:11 +0000 (13:57 +0000)]
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
Narayan Kamath [Fri, 14 Feb 2014 13:17:13 +0000 (13:17 +0000)]
am
3bec0fbb: am
fa8f95e9: Merge "AArch64: Use long for pointers in SurfaceSession class"
* commit '
3bec0fbb349a969934828ee726956877a3a21dee':
AArch64: Use long for pointers in SurfaceSession class
Narayan Kamath [Fri, 14 Feb 2014 13:14:07 +0000 (05:14 -0800)]
am
fa8f95e9: Merge "AArch64: Use long for pointers in SurfaceSession class"
* commit '
fa8f95e9b96e3a12e98269c8a31ed34df6a323ca':
AArch64: Use long for pointers in SurfaceSession class
Narayan Kamath [Fri, 14 Feb 2014 13:10:43 +0000 (13:10 +0000)]
Merge "AArch64: Use long for pointers in SurfaceSession class"
Jeff Brown [Fri, 14 Feb 2014 09:14:15 +0000 (09:14 +0000)]
am
3048191b: Remove onCreate() method that should not be there.
* commit '
3048191b4cf9eff7a72b84065dec2b3dd1e89b3c':
Remove onCreate() method that should not be there.
Jeff Brown [Fri, 14 Feb 2014 09:14:09 +0000 (09:14 +0000)]
am
567f7ca4: Refactor dream manager to new pattern.
* commit '
567f7ca424280ae957b04d4f3df690055f2d41df':
Refactor dream manager to new pattern.
Jeff Brown [Fri, 14 Feb 2014 07:02:05 +0000 (23:02 -0800)]
Remove onCreate() method that should not be there.
Change-Id: I8355dd78f910afa9895d2fa00cb627a0885d9eec
Jeff Brown [Fri, 31 Jan 2014 07:38:03 +0000 (23:38 -0800)]
Refactor dream manager to new pattern.
Change-Id: I99ab4bd98d56a290368dc4b24e5bb24e0656b522
Dianne Hackborn [Fri, 14 Feb 2014 01:54:49 +0000 (01:54 +0000)]
am
01de2432: am
24d8fa73: Merge "frameworks/base: move idmap from frameworks/native"
* commit '
01de243263d347f2ac13a239d67d41817e34df33':
frameworks/base: move idmap from frameworks/native
Wink Saville [Fri, 14 Feb 2014 01:54:43 +0000 (01:54 +0000)]
am
ea56c795: am
bbba8211: Merge "Telephony: Handle DATA_CALL_LIST in DCC."
* commit '
ea56c795b0b4997f5835ec42a18eccdb173bc468':
Telephony: Handle DATA_CALL_LIST in DCC.
Dianne Hackborn [Fri, 14 Feb 2014 01:50:53 +0000 (17:50 -0800)]
am
24d8fa73: Merge "frameworks/base: move idmap from frameworks/native"
* commit '
24d8fa739b7ca0791174af260ed95cdc139e0903':
frameworks/base: move idmap from frameworks/native
Wink Saville [Fri, 14 Feb 2014 01:50:51 +0000 (17:50 -0800)]
am
bbba8211: Merge "Telephony: Handle DATA_CALL_LIST in DCC."
* commit '
bbba8211f9eca938d5d482583fd6e047615b4334':
Telephony: Handle DATA_CALL_LIST in DCC.
Dianne Hackborn [Fri, 14 Feb 2014 01:45:12 +0000 (01:45 +0000)]
Merge "frameworks/base: move idmap from frameworks/native"
Wink Saville [Thu, 13 Feb 2014 23:37:03 +0000 (23:37 +0000)]
Merge "Telephony: Handle DATA_CALL_LIST in DCC."
Craig Mautner [Thu, 13 Feb 2014 19:18:04 +0000 (19:18 +0000)]
am
474f1fbe: Merge "Don\'t null class member before using it." into klp-modular-dev
* commit '
474f1fbe8d87563909c3cb69ec921d427cd1f0b0':
Don't null class member before using it.