summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Merge "AAPT support for feature splits" into lmp-devAdam Lesinski2014-08-091-0/+2
|\
| * AAPT support for feature splitsAdam Lesinski2014-08-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change allows the developer to add a base package for which to build a feature split. The generated resource types will begin after the base APK's defined types so as not to collide or override resources. Multiple features can be generated by first choosing an arbitrary order for the features. Then for each feature, the base APK and any preceding features are specified with the --feature-of flags. So with a base APK 'A' and features, 'B', and 'C', 'B' would be built with aapt package [...] --feature-of A [...] and 'C' would be built with aapt package [...] --feature-of A --feature-of B [...] Change-Id: I1be66e3f8df9a737b21c71f8a93685376c7e6780
* | Disable compilation based on vold.decrypt. [frameworks/base]Brian Carlstrom2014-08-061-0/+1
| | | | | | | | | | | | | | | | Bug: 15165413 (cherry picked from commit 4fd561637a173c7fa6a1d71e9115db1db90514ff) Change-Id: I2a13b63f9d4a7ffd69a8d21666c6dce84739c6ed
* | Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter ↵Brian Carlstrom2014-08-061-0/+4
|/ | | | | | | | | | | | [frameworks/base] This will allow us to conditionally change the compiler-filter based on other properties. Bug: 15165413 (cherry picked from commit f60d3a4702f6d00d7edb5d348c53b9b03ae16b76) Change-Id: I293c81ba817e9abbf9c05b3fb554ef2f0ad0c4ed
* Merge "Add kModeSync" into lmp-devBo Liu2014-07-241-1/+6
|\
| * Add kModeSyncJohn Reck2014-07-241-1/+6
| | | | | | | | | | | | Bug: 16526750 Change-Id: I4c087160e80432739321172fd57880846c8de6e0
* | Move Canvas.h to a new location so that it can be shared with HWUI.Derek Sollenberger2014-07-251-0/+143
|/ | | | | Bug: 15672762 Change-Id: Ia59e986cd4034e16b2e54e8d594e6941a6c9fb1b
* Allow for appending of resources to an AssetManager.Martin Kosiba2014-07-171-0/+1
| | | | | BUG: 11505352 Change-Id: Ifa290580a6dc63c2f471d0bbf5f066db14aed4d7
* am ce75618e: am 5aba0149: am b85afb38: Merge "Make dex2oat heap size product ↵Brian Carlstrom2014-07-091-0/+8
|\ | | | | | | | | | | | | configurable [frameworks/base]" * commit 'ce75618e12deebe302c551281ce56c0d60138e0f': Make dex2oat heap size product configurable [frameworks/base]
| * am 5aba0149: am b85afb38: Merge "Make dex2oat heap size product configurable ↵Brian Carlstrom2014-07-091-0/+8
| |\ | | | | | | | | | | | | | | | | | | [frameworks/base]" * commit '5aba0149b953fb8e85851811dde995fb35c10051': Make dex2oat heap size product configurable [frameworks/base]
| | * Make dex2oat heap size product configurable [frameworks/base]Brian Carlstrom2014-07-081-0/+8
| | | | | | | | | | | | | | | Bug: 15919420 Change-Id: I9b7b4f60826fc9b0cc6bb3765ceaa36542425006
* | | Support multiple resource tables with same packageAdam Lesinski2014-06-183-13/+222
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to support APK split features, the resource table needs to support loading multiple resource tables with the same package but potentially new set of type IDs. This adds some complexity as the type ID space changes from dense and ordered to potentially sparse. A ByteBucketArray is used to store the type IDs in a memory efficient way that allows for fast retrieval. In addition, the IDMAP format has changed. We no longer need random access to the type data, since we store the types differently. However, random access to entries of a given type is still required. Change-Id: If6f5be680b405b368941d9c1f2b5d2ddca964160
* | | camera2: Plumb DngCreator to native library.Ruben Brunk2014-05-161-0/+34
| | | | | | | | | | | | Change-Id: Ic58bf6cf5086808b503460ef8e451fc0d6f1f850
* | | am 97175deb: am 3856a219: am cecfb94f: Merge "Clean up argc / argv ↵Narayan Kamath2014-04-091-3/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | processing for runtime args." * commit '97175deb446cdaca7f3910b71940cb443bda3cc4': Clean up argc / argv processing for runtime args.
| * | am 3856a219: am cecfb94f: Merge "Clean up argc / argv processing for runtime ↵Narayan Kamath2014-04-091-3/+2
| |\ \ | | |/ | | | | | | | | | | | | | | | args." * commit '3856a219fa414ee53c5ef3a0c35dae35e2ca80b1': Clean up argc / argv processing for runtime args.
| | * Clean up argc / argv processing for runtime args.Narayan Kamath2014-04-091-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Make copies of argc, argv before argv is potentially overwritten with the process name. - Allow multiple command line arguments to be passed to ZygoteInit (this is required for some of the 64 bit zygote work). - Add an explanatory comment about how these argments are processed. Change-Id: I752be69c5c0f97ed17d1a3dded19f46ee00929b0
* | | am 642421aa: am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and ↵John Spurlock2014-04-041-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | qualifier." into klp-modular-dev * commit '642421aa7f284817cc1a972a7f9c7a64696a0116': Introduce new UI_MODE_TYPE_WATCH and qualifier.
| * | am 5c31e487: Merge "Introduce new UI_MODE_TYPE_WATCH and qualifier." into ↵John Spurlock2014-04-041-0/+1
| |\ \ | | |/ | |/| | | | | | | | | | | | | klp-modular-dev * commit '5c31e487c4577e1c47ee7c949325d6a13f0d462e': Introduce new UI_MODE_TYPE_WATCH and qualifier.
| | * Introduce new UI_MODE_TYPE_WATCH and qualifier.John Spurlock2014-04-041-0/+1
| | | | | | | | | | | | | | | | | | | | | Default ui mode to watch if we have FEATURE_WATCH. Bug:13395758 Change-Id: Ie5ff95de60e69e91ad3612c7d2f1fca7f49061bd
* | | am 71ae2bd4: am f87b3a25: am 374db6c3: Merge "Remove ↵Narayan Kamath2014-04-031-1/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | ProcessState::mArgc,mArgV,mArgLen" * commit '71ae2bd42be21de6d25d1f8c52e3973c172462df': Remove ProcessState::mArgc,mArgV,mArgLen
| * | Remove ProcessState::mArgc,mArgV,mArgLenNarayan Kamath2014-04-031-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These look like historical oddities, and weren't really being used for anything useful. Process:setArgV0 was being called by android.util.Process, but that functionality can be moved directly into the implementation of that class. bug: 13647418 Change-Id: I216c8f8a4c065f0cf3a61f19f9e32decd26f93f6
* | | Add invokeFunctorJohn Reck2014-03-281-1/+4
| | | | | | | | | | | | Change-Id: I09e675d3e02e3e528642175ada00b2b17fab7652
* | | Remove kStatusInvoke & kStatusDrawJohn Reck2014-03-281-8/+0
| | | | | | | | | | | | | | | | | | They are unused Change-Id: I44ecf1164dc6bc1b09438e733976d5a97a25f00e
* | | Shared library resource supportAdam Lesinski2014-03-252-5/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Shared libraries can now export resources for applications to use. Exporting resources works the same way the framework exports resources, by defining the public symbols in res/values/public.xml. Building a shared library requires aapt to be invoked with the --shared-lib option. Shared libraries will be assigned a package ID of 0x00 at build-time. At runtime, all loaded shared libraries will be assigned a new package ID. Currently, shared libraries should not import other shared libraries, as those dependencies will not be loaded at runtime. At runtime, reflection is used to update the package ID of resource symbols in the shared library's R class file. The package name of the R class file is assumed to be the same as the shared library's package name declared in its manifest. This will be customizable in a future commit. See /tests/SharedLibrary/ for examples of a shared library and its client. Bug:12724178 Change-Id: I60c0cb8ab87849f8f8a1a13431562fe8603020a7
* | | resolved conflicts for merge of 92860a74 to masterNarayan Kamath2014-03-101-25/+44
|\ \ \ | |/ / | | | | | | Change-Id: I3036ef9f1251c756092dc5ee2c4fed8146855e1e
| * | LP64: Make 9 patches architecture agnostic.Narayan Kamath2014-03-101-25/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Res_png_9patch struct had several pointer members whose size differed between 32 and 64 bit platforms. These members have been replaced by uint32_t offsets to serialized data. The serialized form for 9patches places a Res_png_9patch object at the beginning of serialized data, followed by int32_t arrays of xDivs, yDivs and colors. Note that these offsets are not strictly required, since they can be computed from the values of numXDivs, numYDivs & numColors, however they are called in tight loops so having them computed once is a beneficial. This change also removed the unused patch_equals function from aapt's Image.cpp. Change-Id: I3b9ac8ae5c05510d41377cae4dff1c69b40c2531
* | | am 674fd6c4: am a258b4a9: am 485e3b45: am 5c126c3d: Merge "Add dex2oat-flags ↵Brian Carlstrom2014-03-051-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | plumbing to AndroidRuntime" * commit '674fd6c442cd3886b3ab12be1d36c5d05ef48cdb': Add dex2oat-flags plumbing to AndroidRuntime
| * | Add dex2oat-flags plumbing to AndroidRuntimeBrian Carlstrom2014-03-041-1/+1
| | | | | | | | | | | | Change-Id: Idaa7e5351e146d76e1972cbe4d93af69f0b999a6
| * | Extended locales in AAPT / AssetManager.Narayan Kamath2014-02-141-14/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | AssetManager support for 3 letter lang/country codes.Narayan Kamath2014-02-141-4/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
| * | Fix build.Dianne Hackborn2014-02-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | At least part of what is broken. Other stuff still seems to be. (cherry picked from 32bb5fae353b5bb6275e75952e89c514c7369cee) Change-Id: I280376645166fe772ff7a31ff2e8494dce2adbf8
| * | Use size_t* in AssetManager::createIdmapColin Cross2014-02-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | ResTable::createIdmap takes a size_t*, and the idmap command is passing in a size_t*, make AssetManager::createIdmap take a size_t*. Should fix the mac build. Change-Id: Idc16dedfe2aa7367c75f89a937a8242d494e8f8e
* | | Merge "Revert "Split AndroidRuntime into AndroidRuntimeBase base-class and ↵Andreas Huber2014-02-132-53/+16
|\ \ \ | | | | | | | | | | | | the rest.""
| * | | Revert "Split AndroidRuntime into AndroidRuntimeBase base-class and the rest."Andreas Huber2014-02-132-53/+16
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7825334929b098b36e1144872200e75ba6d24b13. Change-Id: I1702eb3ff9d7192d64039c8bf4bc3fc5d8e458c4
* | | | Merge "Split AndroidRuntime into AndroidRuntimeBase base-class and the rest."Andreas Huber2014-02-132-16/+53
|\ \ \ \ | |/ / /
| * | | Split AndroidRuntime into AndroidRuntimeBase base-class and the rest.Andreas Huber2014-02-122-16/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AndroidRuntimeBase (exported by libandroid_runtime_base.so) is all you need to link against to gain the ability to do AndroidRuntimeBase::getJNIEnv() thus minimizing build dependencies. Change-Id: Ia7f0c94c8c02b974c068e0db34774827f96aa95b
* | | | resolved conflicts for merge of 1cbea39f to masterNick Kralevich2014-02-122-29/+21
|\ \ \ \ | | | | | | | | | | | | | | | Change-Id: Ib33484546c6a03cbc4cd96e97d9d785d68e10700
| * \ \ \ resolved conflicts for merge of dd3d95f1 to klp-volantis-devNick Kralevich2014-02-122-29/+21
| |\ \ \ \ | | | |/ / | | |/| | | | | | | Change-Id: I96c0f0da852a0b3cf8aef9158678d38aa30f456f
| | * | | Runtime resource overlay, iteration 2Mårten Kongstad2014-02-032-29/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support any number of overlay packages. Support any target package. UPDATED PACKAGE MATCHING ------------------------ In Runtime resource overlay, iteration 1, only a single overlay package was considered. Package matching was based on file paths: /vendor/overlay/system/framework-res.apk corresponded to /system/framework-res.apk. Introduce a more flexible matching scheme where any package is an overlay package if its manifest includes <overlay targetPackage="com.target.package"/> For security reasons, an overlay package must fulfill certain criteria to take effect: see below. THE IDMAP TOOL AND IDMAP FILES ------------------------------ Idmap files are created by the 'idmap' binary; idmap files must be present when loading packages. For the Android system, Zygote calls 'idmap' as part of the resource pre-loading. For application packages, 'idmap' is invoked via 'installd' during package installation (similar to 'dexopt'). UPDATED FLOW ------------ The following is an outline of the start-up sequences for the Android system and Android apps. Steps marked with '+' are introduced by this commit. Zygote initialization Initial AssetManager object created + idmap --scan creates idmaps for overlays targeting 'android', \ stores list of overlays in /data/resource-cache/overlays.list AssetManager caches framework-res.apk + AssetManager caches overlay packages listed in overlays.list Android boot New AssetManager's ResTable acquired AssetManager re-uses cached framework-res.apk + AssetManager re-uses cached 'android' overlays (if any) App boot ActivityThread prepares AssetManager to load app.apk + ActivityThread prepares AssetManager to load app overlays (if any) New AssetManager's ResTable acquired as per Android boot SECURITY -------- Overlay packages are required to be pre-loaded (in /vendor/overlay). These packages are trusted by definition. A future iteration of runtime resource overlay may add support for downloaded overlays, which would likely require target and overlay signatures match for the overlay to be trusted. LOOKUP PRIORITY --------------- During resource lookup, packages are sequentially queried to provide a best match, given the constraints of the current configuration. If any package provide a better match than what has been found so far, it replaces the previous match. The target package is always queried last. When loading a package with more than one overlay, the order in which the overlays are added become significant if several packages overlay the same resource. Had downloaded overlays been supported, the install time could have been used to determine the load order. Regardless, for pre-installed overlays, the install time is randomly determined by the order in which the Package Manager locates the packages during initial boot. To support a well-defined order, pre-installed overlay packages are expected to define an additional 'priority' attribute in their <overlay> tags: <overlay targetPackage="com.target.package" priority="1234"/> Pre-installed overlays are loaded in order of their priority attributes, sorted in ascending order. Assigning the same priority to several overlays targeting the same base package leads to undefined behaviour. It is the responsibility of the vendor to avoid this. The following example shows the ResTable and PackageGroups after loading an application and two overlays. The resource lookup framework will query the packages in the order C, B, A. +------+------+- -+------+------+ | 0x01 | | ... | | 0x7f | +------+------+- -+------+------+ | | "android" Target package A | Pre-installed overlay B (priority 1) | Pre-installed overlay C (priority 2) Change-Id: If49c963149369b1957f7d2303b3dd27f669ed24e
| * | | | Fix build.Dianne Hackborn2014-02-112-3/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | At least part of what is broken. Other stuff still seems to be. Change-Id: I367dc0377bd5b4e59d9d9b68f3506bf1d64aa591 (cherry picked from commit 32bb5fae353b5bb6275e75952e89c514c7369cee)
* | | | Fix build.Dianne Hackborn2014-02-112-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | At least part of what is broken. Other stuff still seems to be. Change-Id: I367dc0377bd5b4e59d9d9b68f3506bf1d64aa591
* | | | am be49403a: am 0cd115e1: am 578087e3: Merge "New command line tool \'idmap\'"Dianne Hackborn2014-02-112-2/+31
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'be49403a0362c18edaeafe59ac09baac14294dee': New command line tool 'idmap'
| * | | New command line tool 'idmap'Mårten Kongstad2014-02-032-2/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce a new tool 'idmap' to handle generation and verification of idmap files. The tool is modelled on 'dexopt', and is intended to be used similarly, notably by 'installd'. See cmds/idmap/idmap.cpp for further documentation on 'idmap'. Note: this commit is interdependent on a commit in project build/ to add 'idmap' to PRODUCT_PACKAGES. Note: the changes to androidfw are only stubs. The actual implementation will be provided in Runtime resource overlay, iteration 2. Change-Id: I7131b74ece1e46c8a9c0a31d103e686aa07da2bb
| * | | Change ResourceType cookies to int32_t.Narayan Kamath2014-01-311-7/+6
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Also change the order of parameters in ResTable constructors to avoid ambiguity. (cherry picked from commit 00b314436f4fdfada4bbf1e79ec12e9fa38aeaf1) Change-Id: I874c5d03c134dc3c331fba423b5280366296287c
| * | AssetManager cookies should be int32_t and not void*.Narayan Kamath2014-01-271-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cookies are really indices into vectors and arrays, so they don't need to be void*. We choose int32_t instead of size_t to allow their width to be well specified. (cherry picked from commit ebfdd0f467e39c3af8d92cade78263935340acb7) (cherry picked from commit a7fa2e592e2e579e5acdb903dba83fc074ebc215) (cherry picked from commit a9d5701b034ed2d9771b3f0943e1add00741d7cd) Change-Id: I2aed3db568b6fdc487bf99e2c5dd123206736fda
| * | Fix ResTable_config::CONFIG_* typo (MCC vs MNC)Mårten Kongstad2013-12-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 08d5b8f, the ResTable_config::CONFIG_* enum was incorrectly changed to assign the same value to both CONFIG_MCC and CONFIG_MNC: - CONFIG_MCC = 0x0001, - CONFIG_MNC = 0x0002, + CONFIG_MCC = ACONFIGURATION_MCC, + CONFIG_MNC = ACONFIGURATION_MCC, This commit assigns CONFIG_MNC the value ACONFIGURATION_MNC, as intended. Change-Id: I3b8799914a55debdb3ff30a82ada7ad990c49970
| * | Reimplement ZipFileRO in terms of libziparchive.Narayan Kamath2013-12-092-133/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This lets us share zip archive processing code with both the runtime (Art, dalvik) and critical java code (StrictJarFile). This change also moves several utility methods to ZipUtils and dedups code across several zip inflation methods. One of the side effects of this change is that several processing loops are now O(n) instead of O(n^2). bug: 10193060 Change-Id: I3c7188496837a47246c4f342e45485a70fef3169
* | | Move inputservice over to frameworks/nativeMichael Wright2014-02-111-33/+0
| |/ |/| | | | | | | | | | | | | | | | | | | | | Remove all of the pieces except the PointerController and SpriteController over to frameworks/native in preparation for inputflinger. Those two need to stay in frameworks/base for now because they depend on Skia currently. In the long run they should be merged into either the InputManager or the WindowManager rather than as a part of the inputservice / inputflinger. Try 2. Change-Id: I84259356d3eb8efc5aefb9d6b311b5fc590ea3ed
* | Extended locales in AAPT / AssetManager.Narayan Kamath2014-02-101-14/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. Change-Id: I899a56a9a182ee6be52b9389d1ae59266f5482e9
* | AssetManager support for 3 letter lang/country codes.Narayan Kamath2014-02-101-4/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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. Change-Id: I3c2e909ebbebdbbd0ab72a639d531b2b9fdbd9b9