drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
193,906 Commits 1 Branch 0 Tags
Commit Graph

303 Commits

Author SHA1 Message Date
Dan Albert
715d01aedf Clean up test makefiles. 
The build system takes care of linking the correct STL and gtest
libraries for you, and specifying them manually confuses the build
system when using libc++.

Change-Id: I9f76ab26a63ace51293614cfb5ca002f37438e02
 2014-09-11 15:49:57 -07:00
Dan Albert
181f731f9d am 167efbdf: Merge "resolved conflicts for merge of 6c585756 to lmp-dev-plus-aosp" into lmp-dev-plus-aosp 
* commit '167efbdfcf22143c7383091ba46d59bea9921e0d':
  Use char16_t for char things.
 2014-09-09 15:02:57 +00:00
Dan Albert
20ec4fa229 resolved conflicts for merge of 6c585756 to lmp-dev-plus-aosp 
Change-Id: I5a25f2bac44ac5efcd7462af91005e09680a1d96
 2014-09-08 22:25:54 -07:00
Dan Albert
2ffa4aabd7 Merge "Use char16_t for char things." 2014-09-09 04:30:35 +00:00
Dan Albert
f348c15ecf Use char16_t for char things. 
When compiling in C++ mode, the compiler will complain about conversions
from uint16_t to char16_t. Be consistent in using char16_t for strings.

Change-Id: I052b6176ced635162920b31560052d9a64f92764
 2014-09-08 18:30:08 -07:00
Adam Lesinski
c5af80b462 am 834e328a: am a7e85db1: am fe622efc: Merge "Add test to ensure themes get copied from separate resource tables" into lmp-dev 
* commit '834e328a0facf1537d275e1d5c286a2d9df35161':
  Add test to ensure themes get copied from separate resource tables
 2014-09-02 07:10:16 +00:00
Adam Lesinski
1e5c761591 am 21813c19: am 0f885328: am b9095bac: Merge "Clean up test allocations so real memory leaks are more visible" into lmp-dev 
* commit '21813c197f044e7a569bd430d38e710d110c9a8f':
  Clean up test allocations so real memory leaks are more visible
 2014-09-01 11:25:08 +00:00
Adam Lesinski
d299fef90c am a7e85db1: am fe622efc: Merge "Add test to ensure themes get copied from separate resource tables" into lmp-dev 
* commit 'a7e85db12557c0480e3836c414519b28331d502c':
  Add test to ensure themes get copied from separate resource tables
 2014-08-29 23:53:37 +00:00
Adam Lesinski
9d9cc6233c Add test to ensure themes get copied from separate resource tables 
Change-Id: I94e9966cf1e9d0e7e6c7daa0606a87bb0f67705e
 2014-08-29 14:34:54 -07:00
Adam Lesinski
1ff88036da am 0f885328: am b9095bac: Merge "Clean up test allocations so real memory leaks are more visible" into lmp-dev 
* commit '0f885328bc54e896d0f3cdf2faf25abaab95bece':
  Clean up test allocations so real memory leaks are more visible
 2014-08-29 20:05:19 +00:00
Adam Lesinski
d79e33379d Clean up test allocations so real memory leaks are more visible 
Change-Id: Ic405f08c8d8e3e7fc4e4a991671e980752c19899
 2014-08-29 12:29:31 -07:00
Adam Lesinski
c51cc683bc am 056468ef: am 1ec1f85d: am 995c771f: Merge "Fix memory leak in ResTable" into lmp-dev 
* commit '056468ef3b9b63d251c4aac867ae634f813d18cf':
  Fix memory leak in ResTable
 2014-08-29 19:14:28 +00:00
Adam Lesinski
1be18d56a1 am 9e186ec3: am 60f193fb: am e0cfbb61: Merge "Stamp platform version code into app Apks" into lmp-dev 
* commit '9e186ec3a0e87e612786b827c04b6c6e1b507196':
  Stamp platform version code into app Apks
 2014-08-29 19:14:01 +00:00
Adam Lesinski
ec187b726b am 1ec1f85d: am 995c771f: Merge "Fix memory leak in ResTable" into lmp-dev 
* commit '1ec1f85d6ebab39f3aad6f426e0fe0aeca2b04bb':
  Fix memory leak in ResTable
 2014-08-29 18:49:14 +00:00
Adam Lesinski
343cabb316 am 60f193fb: am e0cfbb61: Merge "Stamp platform version code into app Apks" into lmp-dev 
* commit '60f193fbe905f65750503cdaf8616d31c85016d6':
  Stamp platform version code into app Apks
 2014-08-29 18:48:33 +00:00
Adam Lesinski
a9aa9f0458 Merge "Fix memory leak in ResTable" into lmp-dev 2014-08-29 05:27:49 +00:00
Adam Lesinski
7f668d03ce Fix memory leak in ResTable 
We were basically never cleaning any of the
cached bags... oops :S

Bug:16683269
Change-Id: Ic0a44218f660e16fbaac8df1d61ce6f1fdb0018b
 2014-08-28 18:32:32 -07:00
Adam Lesinski
ad2d07d2d9 Stamp platform version code into app Apks 
The versionCode of theframework resources that an app is built against
gets stamped inside an app's AndroidManifest.xml in the <manifest>
tag as "platformBuildVersionCode" and "platformBuildVersionName"
attributes.

Bug:17207635
Change-Id: Id573c3dffcbca38eec9c0eb3e89f4a547e3361d3
 2014-08-27 18:28:49 -07:00
Torne (Richard Coles)
46a807f4eb Also allow + in stringToFloat. 
Some resource files also use a + prefix; allow that as well as -.

Change-Id: I79cf13841849633f8fa49ee7e23698079d890489
 2014-08-27 12:36:44 +01:00
Torne (Richard Coles)
463a7c3add Fix stringToFloat test to allow '-'. 
Check was incorrectly disallowing negative values; allow '-' as the
first character.

Change-Id: I6002c38b4a5141c3ab3e385c4e5fc8c55d285f82
 2014-08-27 11:57:50 +01:00
Deepanshu Gupta
795c1789ef Merge "Fix invalid conditional check in ResourceTypes." 2014-08-27 00:36:43 +00:00
Deepanshu Gupta
71909a62c5 Fix invalid conditional check in ResourceTypes. 
The check was always false. This wasn't really a problem since the regex
check later took care of it. But it's just wrong to leave such mistakes
in the code once they are noticed.

Change-Id: Id3dd602318d8c64d466bd0f102aa3af0a1c80189
 2014-08-26 17:23:19 -07:00
Adam Lesinski
6d41a45679 am 1d3ecf16: am 1c959e92: Merge "Introduce anydpi density resource qualifier" into lmp-dev 
* commit '1d3ecf16766d92ef3d847f1420b9a622e871f6cd':
  Introduce anydpi density resource qualifier
 2014-08-26 17:23:35 +00:00
Adam Lesinski
31245b4f06 Introduce anydpi density resource qualifier 
This is meant to be used with scaleable vector
drawables, and are chosen as the best match unless
there is a configuration that matches the density
requested exactly.

Bug:17007265
Change-Id: Ic3288d0236fe0bff20bb1599aba2582c25b0db32
 2014-08-25 17:47:30 -07:00
Adam Lesinski
ad2d935763 am c931d0d8: am fcb42104: Merge "AAPT: Fix regression generating dynamic ref table for shared libraries" into lmp-dev 
* commit 'c931d0d8540f7648d5bb247fa1b03e492363debb':
  AAPT: Fix regression generating dynamic ref table for shared libraries
 2014-08-21 17:48:33 +00:00
Adam Lesinski
6022debdbc AAPT: Fix regression generating dynamic ref table for shared libraries 
AAPT stopped generating dynamic reference tables for shared libraries.

Change-Id: Ib0025811bdca1a4756eb21080dd6b6bb3fc1ca3d
 2014-08-20 17:55:33 -07:00
Piotr Jastrzebski
fc1b26fc68 am 626e1c65: am 8a28e16c: Merge "Update ziparchive usage to the new API." 
* commit '626e1c65ef408fd9eb7d3bbbbb90137e90c82a4e':
  Update ziparchive usage to the new API.
 2014-08-18 09:12:39 +00:00
Adam Lesinski
ab9b1f5b2a am 5bcfb6b9: am 2fdf2db8: Merge "Fix assumption about DynamicRefTable in aapt" into lmp-dev 
* commit '5bcfb6b98261c94a6ff33438e6b29ca71bb3c0eb':
  Fix assumption about DynamicRefTable in aapt
 2014-08-15 22:07:59 +00:00
Adam Lesinski
2cb761e3dd Fix assumption about DynamicRefTable in aapt 
Packages without any resources should not expect to have
a DynamicRefTable.

Bug:16895517
Bug:17056720
Change-Id: Id006f6bdbf08f30505f6ba5982bc9d1b09db0f0a
 2014-08-15 14:01:43 -07:00
Adam Lesinski
f6530bca9b am e9e52a2a: am 41cdc4c7: Merge "Revert "Fix aapt dump for APKs with no resources"" into lmp-dev 
* commit 'e9e52a2ae2e80286447767b9a83b04d88c41c112':
  Revert "Fix aapt dump for APKs with no resources"
 2014-08-15 17:32:04 +00:00
Piotr Jastrzebski
e2134a4b5d Update ziparchive usage to the new API. 
Bug: 16162465

Change-Id: If3064e2be3e7e85366b07434294a7879b0e5f9bc
 2014-08-15 14:41:08 +01:00
Adam Lesinski
ac44bd1c5b am 4e790e9e: am b4c3c976: Fix crash in ResStringPool 
* commit '4e790e9e4b820290284a78c4258d4d60e8d37320':
  Fix crash in ResStringPool
 2014-08-15 11:51:01 +00:00
Adam Lesinski
fd9205603a am f3e588ba: am 83b8dc7e: Merge "Fix aapt dump for APKs with no resources" into lmp-dev 
* commit 'f3e588bae0b6bdfef1c09f739b68b3e07548f58f':
  Fix aapt dump for APKs with no resources
 2014-08-15 11:49:20 +00:00
Adam Lesinski
20ad556d75 am 3c9b2a54: am b6355bcb: Merge "Print xxxhdpi from ResTable_config::toString" into lmp-dev 
* commit '3c9b2a540e123a17c91883dd48fb703c6a31982d':
  Print xxxhdpi from ResTable_config::toString
 2014-08-15 11:49:15 +00:00
Adam Lesinski
4b2d0f20db Fix crash in ResStringPool 
When a String isn't found in the StringPool,
we should not try to construct a String8 object
from the NULL string.

Bug:15163956
Change-Id: I51e701918b10a72c18a860b8a36dce2afd9c0b82
 2014-08-15 06:39:01 +00:00
Adam Lesinski
89147ed84b Merge "Revert "Fix aapt dump for APKs with no resources"" into lmp-dev 2014-08-15 04:37:53 +00:00
Adam Lesinski
18560886cb Revert "Fix aapt dump for APKs with no resources" 
This reverts commit 0e475302cd196f45a01a525c49089018b238d4ba.

I'll re-upload this CL with the correct fix in LoadedApk.

Change-Id: I17c6381f8e5907dab9f996f89c5d435b9c08a13a
 2014-08-15 17:18:21 +00:00
Adam Lesinski
e23a91e2bd Fix aapt dump for APKs with no resources 
All APKs are expected to have at least one resource table (even if
it is empty). We were missing the creation of an empty DynamicRefTable.

Bug:16895517
Change-Id: I6a6e887f91b3b4bbcc52b3fd2741ef3d05fab1fd
 2014-08-14 21:20:41 +00:00
Adam Lesinski
d7df9d7b38 Merge "Fix aapt dump for APKs with no resources" into lmp-dev 2014-08-14 16:46:52 +00:00
Adam Lesinski
8d5667d2a2 Print xxxhdpi from ResTable_config::toString 
Change-Id: I2e1a07649cb498c12023b198d8e50534f9d91840
 2014-08-14 21:35:37 +00:00
Adam Lesinski
9014777956 am ff8afc33: am 248da634: Merge "Fix shared library bug in bag attributes" into lmp-dev 
* commit 'ff8afc3309d98796767a8859a9a2e262fe1fc165':
  Fix shared library bug in bag attributes
 2014-08-11 18:03:20 +00:00
Adam Lesinski
ccf25c7bf6 Fix shared library bug in bag attributes 
A ResTable_map entry has a name attribute, which
could be a dynamic reference if it comes from
a shared library. It was not being patched with
the correct package id.

Bug:16795890
Change-Id: Ia8df6a943269b2fefb2132c3ed74eb1997d7701b
 2014-08-11 09:16:01 -07:00
Piotr Jastrzebski
6da63f63a2 am 388aedee: am 07291ccc: Merge "Remove memory leak." 
* commit '388aedee0483ed7132849584816b86c1a4377799':
  Remove memory leak.
 2014-08-11 10:04:56 +00:00
Piotr Jastrzebski
1a68b079d7 Remove memory leak. 
Call EndIteration in endIteration to free memory allocated for cookie in
StartIteration.

Change-Id: I3d58a461c2f3676565cfd7922dc6d8d5c35feae9
 2014-08-11 08:20:35 +01:00
Adam Lesinski
833f3ccbc8 AAPT support for feature splits 
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
 2014-08-04 18:48:14 -07:00
Adam Lesinski
f28d505dc5 Ensure the ResTable data is at least the size of a ResTable_header 
Change-Id: Ib8d5574bd6a125797a582837987332e66721e84d
 2014-07-29 17:42:34 +00:00
Martin Kosiba
7df3625d5b Allow for appending of resources to an AssetManager. 
BUG: 11505352
Change-Id: Ifa290580a6dc63c2f471d0bbf5f066db14aed4d7
 2014-07-17 18:10:02 +01:00
Elliott Hughes
6a4deeda70 Switch frameworks/base/libs/androidfw to the new icu. 
Change-Id: Id82830750dd7e83bbc66811a1133b403cc697c97
 2014-07-09 16:58:28 -07:00
Elliott Hughes
e8e968a7c6 am 583a845c: am 3964ea46: am d74f99d3: Merge "Switch frameworks/base/libs/androidfw to the new icu." 
* commit '583a845c6eb6308d7ada72cb0e91444efc91cc54':
  Switch frameworks/base/libs/androidfw to the new icu.
 2014-07-10 00:42:48 +00:00
Elliott Hughes
583a845c6e am 3964ea46: am d74f99d3: Merge "Switch frameworks/base/libs/androidfw to the new icu." 
* commit '3964ea46750cd5715f29ad4d9cada4a35208ad7a':
  Switch frameworks/base/libs/androidfw to the new icu.
 2014-07-10 00:16:43 +00:00