]>
git.saurik.com Git - android/aapt.git/log
Ying Wang [Thu, 26 Apr 2012 01:53:49 +0000 (18:53 -0700)]
Apply --extra-packages in case --custom-pacakge is also specified.
Cherry-picked from master.
Change-Id: I2d67b8821afdf064f4186ccd8def1b65f9a7dc88
Dianne Hackborn [Sat, 14 Apr 2012 02:18:41 +0000 (19:18 -0700)]
Add new aapt dump badging output explaining implicit badging.
New uses-implied-feature and uses-implied-permission tell you
about any features or permissions that aapt is automatically
adding to your app, and why it is doing so.
Change-Id: I45edb055408e1259699c994f956166ce67e8db5d
Dan Morrill [Wed, 11 Apr 2012 00:13:17 +0000 (17:13 -0700)]
Merge "Adding a line for android-debuggable to 'dump badging' if AndroidManifest.xml is configured as such. This is to be used by e.g. Play Store to warn the developer that they are about to publish a security hole."
Dianne Hackborn [Fri, 6 Apr 2012 02:33:30 +0000 (19:33 -0700)]
Implement call log permission compatibility.
If a pre-JellyBean application requests read/write contacts, it
will implicitly be given read/write call log.
Change-Id: I029db4b09fda737bb8fba4e1611355ebdbbfd34f
Amith Yamasani [Wed, 4 Apr 2012 17:27:15 +0000 (10:27 -0700)]
Embed layout padding in nine patch images
- Added a new custom PNG chunk that carries the layout padding ints.
- Extract the padding ticks from .9.png images and store in the chunk.
- Load the padding information at runtime into Bitmap and NinePatchDrawable.
- The new chunk is ordered first so that it doesn't cause a problem in older
versions of the platform.
Bug:
6087201
Change-Id: I5de46167a1d44b3ec21065b0c165e594b1dc8399
Dan Morrill [Tue, 3 Apr 2012 19:44:40 +0000 (12:44 -0700)]
Adding a line for android-debuggable to 'dump badging' if AndroidManifest.xml
is configured as such. This is to be used by e.g. Play Store to warn the
developer that they are about to publish a security hole.
Change-Id: Ib6f8537462cbc00ed0504435bdeee2aae0c5b69b
Colin Cross [Fri, 23 Mar 2012 01:43:07 +0000 (18:43 -0700)]
frameworks/base: move Zip* from libandroidfw to libutils
ZipUtils is needed by build/tools, move it from libandroidfw
(frameworks/base) to libutils (frameworks/native).
Change-Id: I2b4b7adcdf68eb25ee7cba5dd3b69eadf0523af3
Mike Lockwood [Thu, 22 Mar 2012 22:32:51 +0000 (15:32 -0700)]
Merge remote-tracking branch 'goog/ics-aah-exp' into merge
Jeff Brown [Mon, 19 Mar 2012 21:08:58 +0000 (14:08 -0700)]
Use qsort_r_compat() as a portable wrapper for qsort_r().
Change-Id: Ie79f81625947f4e95122047605d994c86e872e74
Jeff Brown [Mon, 19 Mar 2012 19:02:10 +0000 (12:02 -0700)]
Fix build break on glibc, for real.
Change-Id: I8bbec237229b05f96c708d41f3c4da17e2a90e2b
Jeff Brown [Mon, 19 Mar 2012 18:48:12 +0000 (11:48 -0700)]
Fix build break on glibc hosts.
Change-Id: Ida70bec6ea972d042982428353cbbc33cde25136
Jeff Brown [Sat, 17 Mar 2012 05:17:41 +0000 (22:17 -0700)]
aapt: Preprocess images in parallel.
Currently hardcoded to use up to 4 threads.
This change substantially reduces the amount of time spent
preprocessing framework resources to just a few seconds.
Change-Id: I02fdd283fb529a152aeb22ac87f278779fd77983
Jeff Brown [Sat, 17 Mar 2012 02:25:20 +0000 (19:25 -0700)]
Use quicksort to sort the string pool.
The current implementation of Vector::sort uses insertion sort
on the assumption that the data is mostly sorted. It isn't.
This change brings the total time spent sorting packages by config
down to 500ms from about 93 seconds.
Bug:
6186278
Change-Id: Iec8da11e09297acd6c73733d063b0fa9dacf69f7
Jeff Brown [Fri, 16 Mar 2012 22:25:17 +0000 (15:25 -0700)]
Add some comments about StringPool sort order.
Change-Id: I57f24d46328a6bfef883819eaf95c03114d573bb
Jeff Brown [Fri, 16 Mar 2012 22:25:17 +0000 (15:25 -0700)]
Remove dead code in StringPool.
The sorted string pool option was no longer used.
Neither were strings with associated identifiers.
Change-Id: Ic5f6368637fbeedfda873d63f4ad0f3ea9d0d603
Jeff Brown [Fri, 16 Mar 2012 22:24:32 +0000 (15:24 -0700)]
Make StringPool entry types trivially movable.
Change-Id: If93957a840a0f1cae2e6ef291eeeb1b0c7c20958
Dianne Hackborn [Mon, 12 Mar 2012 17:51:26 +0000 (10:51 -0700)]
Add new READ_EXTERNAL_STORAGE permission.
Also adds some initial compatibility code for dealing with it.
Change-Id: I104bff11798349e4aaa6da9b7be787b257daa1bb
Ben Gruver [Thu, 8 Mar 2012 22:52:09 +0000 (14:52 -0800)]
Merge "Fix an issue where a non-styled string could be made into a styled string"
Ben Gruver [Thu, 8 Mar 2012 05:19:16 +0000 (21:19 -0800)]
Fix an issue where a non-styled string could be made into a styled string
If a styled version of an otherwise identical string is encountered before
a non-styled version, aapt merges the two, effectively making the
non-styled string have a spurious style.
Change-Id: I424a61c0c83c59e0b9c8939e457402efd06a7a4f
Ben Gruver [Thu, 8 Mar 2012 00:16:18 +0000 (16:16 -0800)]
Merge "Fix up getAttributeFlags() function"
Ramanan Rajeswaran [Wed, 7 Mar 2012 23:39:40 +0000 (15:39 -0800)]
am
4ec961d5 : (-s ours) DO NOT MERGE
* commit '
4ec961d5752363161cc78112fbe542b1c0473158 ':
DO NOT MERGE
Dianne Hackborn [Wed, 7 Mar 2012 23:39:38 +0000 (15:39 -0800)]
am
b663a4b7 : (-s ours) Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
* commit '
b663a4b7da68cc6d81d4b338d94fb48eaec8cb05 ':
Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
Ramanan Rajeswaran [Wed, 7 Mar 2012 23:34:11 +0000 (15:34 -0800)]
am
5e7bb1e6 : (-s ours) DO NOT MERGE
* commit '
5e7bb1e675df2cc1edd9808afcaaeed07830bd9f ':
DO NOT MERGE
Dianne Hackborn [Wed, 7 Mar 2012 23:34:10 +0000 (15:34 -0800)]
am
e6a0ec60 : (-s ours) Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
* commit '
e6a0ec60607783b426b92f638055c79178fdd892 ':
Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
Ben Gruver [Wed, 7 Mar 2012 03:26:22 +0000 (19:26 -0800)]
Fix up getAttributeFlags() function
In addition to a couple of minor clean-up items, this fixes an issue that can
rarely cause incorrect parsing of attribute flag values, when there is a '|'
character in the few bytes past the end of the attribute value being parsed.
Change-Id: I6050b1c2db60720c7c0ab7df9eba8cfc629b320e
Ramanan Rajeswaran [Mon, 13 Feb 2012 21:53:39 +0000 (13:53 -0800)]
DO NOT MERGE
Revert "Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc."
This reverts commit
c1496d2d9a496e4aba817a58ecb9e07fe55cdba5 .
Change-Id: If60df742b19c925cc99b20d01108b84415b124ad
Dianne Hackborn [Wed, 25 Jan 2012 23:12:23 +0000 (15:12 -0800)]
Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
Change-Id: I519d6cdc527a402d93b98df17a64fc1da52ad598
Ramanan Rajeswaran [Mon, 13 Feb 2012 21:53:39 +0000 (13:53 -0800)]
DO NOT MERGE
Revert "Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc."
This reverts commit
c1496d2d9a496e4aba817a58ecb9e07fe55cdba5 .
Change-Id: If60df742b19c925cc99b20d01108b84415b124ad
Dianne Hackborn [Wed, 25 Jan 2012 23:12:23 +0000 (15:12 -0800)]
Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
Change-Id: I519d6cdc527a402d93b98df17a64fc1da52ad598
Xavier Ducrohet [Fri, 24 Feb 2012 02:49:51 +0000 (18:49 -0800)]
am
1704a5cc : (-s ours) am
f31297ed : am
816b873d : Move the automatic namespace outside of the res namespace. do not merge.
* commit '
1704a5cc59c501fab53dbd2e754a8479ac1f57ca ':
inazaruk [Fri, 24 Feb 2012 02:49:47 +0000 (18:49 -0800)]
am
737d6ef5 : (-s ours) am
68ad43e1 : am
eed8d0b3 : Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.
* commit '
737d6ef5f1b545f3fc3bb0d839abc9a421760ed1 ':
Xavier Ducrohet [Fri, 24 Feb 2012 02:47:08 +0000 (18:47 -0800)]
am
54c8c3d9 : (-s ours) am
b3c780f1 : am
816b873d : Move the automatic namespace outside of the res namespace. do not merge.
* commit '
54c8c3d920ee863716638483602a011943da6484 ':
Move the automatic namespace outside of the res namespace. do not merge.
inazaruk [Fri, 24 Feb 2012 02:47:06 +0000 (18:47 -0800)]
am
85eb3f0a : (-s ours) am
9694910e : am
eed8d0b3 : Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.
* commit '
85eb3f0af00aa35cceebbf162de4434418bf5a84 ':
Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.
Xavier Ducrohet [Fri, 24 Feb 2012 02:45:56 +0000 (18:45 -0800)]
am
f31297ed : am
816b873d : Move the automatic namespace outside of the res namespace. do not merge.
* commit '
f31297edf899997dc9f173f6ddca30b0e4f2d677 ':
inazaruk [Fri, 24 Feb 2012 02:45:53 +0000 (18:45 -0800)]
am
68ad43e1 : am
eed8d0b3 : Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.
* commit '
68ad43e10ba76721295e66b746c5f5c5e7094a0b ':
Xavier Ducrohet [Fri, 24 Feb 2012 02:44:16 +0000 (18:44 -0800)]
am
b3c780f1 : am
816b873d : Move the automatic namespace outside of the res namespace. do not merge.
* commit '
b3c780f16c37d2fb41a4eb211ea062b4c0b4e366 ':
Move the automatic namespace outside of the res namespace. do not merge.
inazaruk [Fri, 24 Feb 2012 02:44:14 +0000 (18:44 -0800)]
am
9694910e : am
eed8d0b3 : Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.
* commit '
9694910e17a18c307e61811284f88a26db2bfbae ':
Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.
Xavier Ducrohet [Fri, 24 Feb 2012 02:42:04 +0000 (18:42 -0800)]
am
816b873d : Move the automatic namespace outside of the res namespace. do not merge.
* commit '
816b873df1ab98d0e79913cf589b7b1fbaf14e85 ':
Move the automatic namespace outside of the res namespace. do not merge.
inazaruk [Fri, 24 Feb 2012 02:42:02 +0000 (18:42 -0800)]
am
eed8d0b3 : Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.
* commit '
eed8d0b3af8e76d6146ce4ed3fbe6ef7e172c8cd ':
Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.
Xavier Ducrohet [Fri, 24 Feb 2012 02:42:01 +0000 (18:42 -0800)]
am
816b873d : Move the automatic namespace outside of the res namespace. do not merge.
* commit '
816b873df1ab98d0e79913cf589b7b1fbaf14e85 ':
Move the automatic namespace outside of the res namespace. do not merge.
inazaruk [Fri, 24 Feb 2012 02:41:54 +0000 (18:41 -0800)]
am
eed8d0b3 : Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.
* commit '
eed8d0b3af8e76d6146ce4ed3fbe6ef7e172c8cd ':
Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.
Xavier Ducrohet [Fri, 24 Feb 2012 02:41:48 +0000 (18:41 -0800)]
am
816b873d : Move the automatic namespace outside of the res namespace. do not merge.
* commit '
816b873df1ab98d0e79913cf589b7b1fbaf14e85 ':
Move the automatic namespace outside of the res namespace. do not merge.
inazaruk [Fri, 24 Feb 2012 02:41:43 +0000 (18:41 -0800)]
am
eed8d0b3 : Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.
* commit '
eed8d0b3af8e76d6146ce4ed3fbe6ef7e172c8cd ':
Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.
Xavier Ducrohet [Fri, 24 Feb 2012 00:59:27 +0000 (16:59 -0800)]
Move the automatic namespace outside of the res namespace. do not merge.
(cherry picked from commit
d9fe8018ffbf94f18a840005e688ad1d712f0225 )
Change-Id: I48ca78d5fccc75392b3f1cf9525890e5145293c4
inazaruk [Sun, 22 May 2011 22:09:06 +0000 (15:09 -0700)]
Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.
Added support for predefined namespace http://schemas.android.com/apk/res/auto
that aapt tool recognizes and treats as namespace with package name
taken from current application's AndroidManifest.xml, //manifest/package attribute.
Signed-off-by: inazaruk <ievgenii.nazaruk@gmail.com>
(cherry picked from commit
e348909c1966c3d192841cc131a32be6ed90da18 )
Change-Id: I4bff836c42a309bac36e5d1ce1899131b3c4c194
Xavier Ducrohet [Fri, 24 Feb 2012 00:59:27 +0000 (16:59 -0800)]
Move the automatic namespace outside of the res namespace.
Change-Id: I107ee94af0a13f008ef4a8844a9038b84f97a247
Jean-Baptiste Queru [Thu, 23 Feb 2012 21:04:24 +0000 (13:04 -0800)]
am
0842a226 : am
fe99051c : am
0e25e4cd : am
63e43ba5 : Merge "Fix for issue 9656 - custom xml attributes in Android Libraries"
* commit '
0842a2262d03fc98e42541cb38f51a341d346ae0 ':
Fix for issue 9656 - custom xml attributes in Android Libraries
Jean-Baptiste Queru [Thu, 23 Feb 2012 21:01:59 +0000 (13:01 -0800)]
am
fe99051c : am
0e25e4cd : am
63e43ba5 : Merge "Fix for issue 9656 - custom xml attributes in Android Libraries"
* commit '
fe99051c78994e0cc5153468eeba6f75f3e04b8e ':
Fix for issue 9656 - custom xml attributes in Android Libraries
Jean-Baptiste Queru [Thu, 23 Feb 2012 20:57:03 +0000 (12:57 -0800)]
am
63e43ba5 : Merge "Fix for issue 9656 - custom xml attributes in Android Libraries"
* commit '
63e43ba56a95708c229eec539a544967f1bbb7d7 ':
Fix for issue 9656 - custom xml attributes in Android Libraries
Jean-Baptiste Queru [Thu, 23 Feb 2012 20:38:12 +0000 (12:38 -0800)]
Merge "Fix for issue 9656 - custom xml attributes in Android Libraries"
Mathias Agopian [Tue, 21 Feb 2012 22:34:47 +0000 (14:34 -0800)]
another attempt at fixing the linux build
Change-Id: Iac20439fd6eea4682859112e72f051294bc87ef6
Mathias Agopian [Tue, 21 Feb 2012 00:58:20 +0000 (16:58 -0800)]
frameworks/base refactoring
create the new libandroidfw from parts of libui and libutils
Change-Id: I1584995616fff5d527a2aba63921b682a6194d58
Mathias Agopian [Sat, 18 Feb 2012 02:27:36 +0000 (18:27 -0800)]
frameworks/base refactoring.
step 2: move libutils headers to their new home: androidfw
Change-Id: I14624ba23db92a81f2cb929f104386e1fab293ef
Ramanan Rajeswaran [Tue, 14 Feb 2012 15:36:53 +0000 (07:36 -0800)]
am
128dfa51 : (-s ours) Merge "DO NOT MERGE" into ics-scoop-plus-aosp
* commit '
128dfa514818399ff8b5fde56fa487374f6fd504 ':
DO NOT MERGE
Ramanan Rajeswaran [Mon, 13 Feb 2012 21:53:39 +0000 (13:53 -0800)]
DO NOT MERGE
Revert "Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc."
This reverts commit
c1496d2d9a496e4aba817a58ecb9e07fe55cdba5 .
Change-Id: If60df742b19c925cc99b20d01108b84415b124ad
Dianne Hackborn [Mon, 13 Feb 2012 22:42:40 +0000 (14:42 -0800)]
am
84affb8a : Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
* commit '
84affb8ae6477c46c75f834b73daa13b2a751c21 ':
Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
Dianne Hackborn [Wed, 25 Jan 2012 23:12:23 +0000 (15:12 -0800)]
Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
Change-Id: I519d6cdc527a402d93b98df17a64fc1da52ad598
Ramanan Rajeswaran [Mon, 13 Feb 2012 22:27:40 +0000 (14:27 -0800)]
am
352b8d03 : (-s ours) am
8046e294 : Merge "DO NOT MERGE" into ics-scoop
* commit '
352b8d03c63585f4eaec09d2e39a4d173be83164 ':
DO NOT MERGE
Ramanan Rajeswaran [Mon, 13 Feb 2012 22:24:38 +0000 (14:24 -0800)]
am
8046e294 : Merge "DO NOT MERGE" into ics-scoop
* commit '
8046e294c545b8e3712bff7925b024639936d5bf ':
DO NOT MERGE
Ramanan Rajeswaran [Mon, 13 Feb 2012 21:53:39 +0000 (13:53 -0800)]
DO NOT MERGE
Revert "Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc."
This reverts commit
c1496d2d9a496e4aba817a58ecb9e07fe55cdba5 .
Change-Id: If60df742b19c925cc99b20d01108b84415b124ad
Dianne Hackborn [Mon, 13 Feb 2012 20:41:27 +0000 (12:41 -0800)]
am
d1f88de2 : am
c1496d2d : Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
* commit '
d1f88de2c496423e483760654a4381b563dc1e1d ':
Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
Dianne Hackborn [Mon, 13 Feb 2012 20:38:37 +0000 (12:38 -0800)]
am
c1496d2d : Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
* commit '
c1496d2d9a496e4aba817a58ecb9e07fe55cdba5 ':
Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
Dianne Hackborn [Wed, 25 Jan 2012 23:12:23 +0000 (15:12 -0800)]
Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
Change-Id: I519d6cdc527a402d93b98df17a64fc1da52ad598
Dianne Hackborn [Mon, 6 Feb 2012 23:33:21 +0000 (15:33 -0800)]
Only generate private symbols that are needed.
Change-Id: Icc4c86638db8429a387bf87c934cc712f807e213
Xavier Ducrohet [Mon, 6 Feb 2012 19:46:49 +0000 (11:46 -0800)]
am
9485ca87 : am
b54f371c : am
f8aea993 : Make aapt ignore tools-related data.
* commit '
9485ca87edd819e3106a4b8c3d08f1ab73adf818 ':
Xavier Ducrohet [Mon, 6 Feb 2012 19:44:43 +0000 (11:44 -0800)]
am
3d4db0dc : am
c205a9d6 : am
f8aea993 : Make aapt ignore tools-related data.
* commit '
3d4db0dc1803252b924076f7d10d8e806af71824 ':
Make aapt ignore tools-related data.
Xavier Ducrohet [Mon, 6 Feb 2012 19:44:19 +0000 (11:44 -0800)]
am
b54f371c : am
f8aea993 : Make aapt ignore tools-related data.
* commit '
b54f371cc4cfd32acf0fec35885a1da64accec9e ':
Xavier Ducrohet [Mon, 6 Feb 2012 19:42:50 +0000 (11:42 -0800)]
am
c205a9d6 : am
f8aea993 : Make aapt ignore tools-related data.
* commit '
c205a9d68c23e9ade2cbe28bba0f257d84d23a97 ':
Make aapt ignore tools-related data.
Xavier Ducrohet [Mon, 6 Feb 2012 19:41:56 +0000 (11:41 -0800)]
am
f8aea993 : Make aapt ignore tools-related data.
* commit '
f8aea99385df8373b6edd6d5dd1d15b7b36b525b ':
Make aapt ignore tools-related data.
Xavier Ducrohet [Mon, 6 Feb 2012 19:41:37 +0000 (11:41 -0800)]
am
f8aea993 : Make aapt ignore tools-related data.
* commit '
f8aea99385df8373b6edd6d5dd1d15b7b36b525b ':
Make aapt ignore tools-related data.
Xavier Ducrohet [Fri, 3 Feb 2012 01:18:18 +0000 (17:18 -0800)]
Make aapt ignore tools-related data.
This patchset introduces a new standard namespace http://schemas.android.com/tools
which will be used for tools specific XML attributes.
Any attributes using this namespace will not be compiled into the binary XML file.
The namespace node is also not written at all, and its string is not collected
to ensure that there is no impact on the devices.
(cherry picked from commit
a5d5e9d906583ebeb590ca200ca9840302a5cd1a )
Change-Id: I62937b8bc34c07ac544930aa8eadd7797e0179d5
Xavier Ducrohet [Fri, 3 Feb 2012 01:18:18 +0000 (17:18 -0800)]
Make aapt ignore tools-related data.
This patchset introduces a new standard namespace http://schemas.android.com/tools
which will be used for tools specific XML attributes.
Any attributes using this namespace will not be compiled into the binary XML file.
The namespace node is also not written at all, and its string is not collected
to ensure that there is no impact on the devices.
Change-Id: I3e75d44cda54e1fa7b5cdc56b3eb27db80fe7761
Dianne Hackborn [Tue, 31 Jan 2012 19:27:43 +0000 (11:27 -0800)]
aapt now sorts the strings in the resource string pool.
In our current environment with very many translations, this can
save a lot of RAM -- for example over 200K in Gmail just by sorting
the strings in the Gmail .apk (not the framework).
Also add a new aapt command to print the contents of the resource
table string pool.
Change-Id: I1da037b3e2c377b890833ff57ab158965314ac48
Dianne Hackborn [Wed, 25 Jan 2012 23:12:23 +0000 (15:12 -0800)]
Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.
Change-Id: I519d6cdc527a402d93b98df17a64fc1da52ad598
Jean-Baptiste Queru [Sat, 21 Jan 2012 00:37:49 +0000 (16:37 -0800)]
am
45470559 : (-s ours) am
12b7da69 : am
6df477be : Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)"
* commit '
45470559cd4a499fd5d38cf708f0b531dc081fed ':
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
Jean-Baptiste Queru [Sat, 21 Jan 2012 00:35:20 +0000 (16:35 -0800)]
am
db2b3930 : (-s ours) am
f3f650db : am
a826f9e2 : Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)"
* commit '
db2b39300a8f763cf2d0c9808deb86db87d5492c ':
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
Jean-Baptiste Queru [Sat, 21 Jan 2012 00:32:45 +0000 (16:32 -0800)]
am
dde686e2 : (-s ours) am
08d3c6e5 : am
4f367f33 : Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)"
* commit '
dde686e2bdf7ea679dae4fd4edbf94c71802dc28 ':
Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
Jean-Baptiste Queru [Sat, 21 Jan 2012 00:30:21 +0000 (16:30 -0800)]
am
a1e87397 : (-s ours) am
7ae84204 : am
ba7f0d2a : Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)"
* commit '
a1e873975704814416ee4d5023bf0740ec195ec0 ':
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
Jean-Baptiste Queru [Sat, 21 Jan 2012 00:28:04 +0000 (16:28 -0800)]
am
d6b5584b : (-s ours) am
97aa8ee8 : Merge
ee4618bc
* commit '
d6b5584b67f8a2f3d8ea20d748652673d5761e33 ':
Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)
Steve Block [Fri, 6 Jan 2012 19:20:56 +0000 (19:20 +0000)]
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
Change-Id: I1de629b4632a4b3187ca1a28d6416daccd35f924
Steve Block [Thu, 5 Jan 2012 23:22:43 +0000 (23:22 +0000)]
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
Change-Id: I8fbdfa7a7581f481968dbb65aa40f7042936d7cb
Steve Block [Wed, 4 Jan 2012 20:05:49 +0000 (20:05 +0000)]
Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
Change-Id: I26f76452ac49e2890b14d133c065493d8df0fb4a
Steve Block [Tue, 20 Dec 2011 16:23:08 +0000 (16:23 +0000)]
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
Change-Id: I44f267700356967dc51e8f85ebf457dc85cfb229
Steve Block [Thu, 20 Oct 2011 10:56:00 +0000 (11:56 +0100)]
Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)
Change-Id: I5321ebd12e9c6248a108529e82c4e1af2a4405e3
Steve Block [Fri, 6 Jan 2012 19:20:56 +0000 (19:20 +0000)]
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/#/c/157220
Bug:
5449033
Change-Id: Ic9c19d30693bd56755f55906127cd6bd7126096c
Dan Morrill [Fri, 6 Jan 2012 22:39:11 +0000 (14:39 -0800)]
Merge "Minor tweak to console output."
Dan Morrill [Fri, 6 Jan 2012 18:47:10 +0000 (10:47 -0800)]
Minor tweak to console output.
Change-Id: I494910eda1d02f6bcff945b9a13c83767f2248b6
Steve Block [Thu, 5 Jan 2012 23:22:43 +0000 (23:22 +0000)]
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/157065
Bug:
5449033
Change-Id: I00a4b904f9449e6f93b7fd35eac28640d7929e69
Steve Block [Wed, 4 Jan 2012 20:05:49 +0000 (20:05 +0000)]
Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/156801
Bug:
5449033
Change-Id: Ib08fe86d23db91ee153e9f91a99a35c42b9208ea
Steve Block [Tue, 20 Dec 2011 16:23:08 +0000 (16:23 +0000)]
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/156016
Bug:
5449033
Change-Id: I4c4e33bb9df3e39e11cd985e193e6fbab4635298
Joe Onorato [Thu, 15 Dec 2011 04:59:30 +0000 (20:59 -0800)]
Add a new ui mode for "appliance"
The idea is that this is a device which is more-or-less headless. It
might have some limited interaction capabilities, but it's not something
that you want to rely on having.
Change-Id: Ib92f53a120bf83de781728011721a4859def7d9f
Joe Onorato [Thu, 15 Dec 2011 04:59:30 +0000 (20:59 -0800)]
Add a new ui mode for "appliance"
The idea is that this is a device which is more-or-less headless. It
might have some limited interaction capabilities, but it's not something
that you want to rely on having.
Change-Id: Icc9f674299f8dbe2b736a5622a4965904d27e49c
Raphael [Mon, 12 Dec 2011 23:39:30 +0000 (15:39 -0800)]
am
ab8d6785 : (-s ours) am
2ace3b01 : Merge "Merge "AAPT fix printf %zd crash on Windows". Do not merge." into ics-mr1
* commit '
ab8d6785dcefa5b2b66f6c042475a0f9f558dd45 ':
Merge "AAPT fix printf %zd crash on Windows". Do not merge.
Raphael [Mon, 12 Dec 2011 21:16:32 +0000 (13:16 -0800)]
am
2ace3b01 : Merge "Merge "AAPT fix printf %zd crash on Windows". Do not merge." into ics-mr1
* commit '
2ace3b01ab9447ce9fda2f578e31c1c11f4837cb ':
Merge "AAPT fix printf %zd crash on Windows". Do not merge.
Raphael [Fri, 28 Oct 2011 00:01:31 +0000 (17:01 -0700)]
Merge "AAPT fix printf %zd crash on Windows". Do not merge.
There's no printf %zd on Mingw/Cygwin so the verbose
printf crashes aapt.
SDK bugs: 20395, 20986
Bug:
5742142
(cherry picked from commit
f51125d8429ffa71c57ba6fbdca9effc72642a9b )
Change-Id: I7545734ce8ce4a1f3e95f8a255daa8a909f870a1
Kenny Root [Thu, 8 Dec 2011 16:46:03 +0000 (08:46 -0800)]
Add aapt support for implicitly-granted permissions
Bug:
2363582
Bug:
2877343
Change-Id: Iff7b496fb845e45fe1be2317089a96f7d63ed223
Ed Heyl [Mon, 31 Oct 2011 13:06:27 +0000 (06:06 -0700)]
merged by hand (services/java/com/android/server/PowerManagerService.java needs to be reviewed)
Change-Id: I86d1111d86cd1646ebc8a88d58aa393089e9f928
Raphael [Fri, 28 Oct 2011 22:27:22 +0000 (22:27 +0000)]
am
48ba4139 : (-s ours) am
fe9a2a54 : (-s ours) Cherry-pick
f51125d from master to ics-mr0. do not merge.
* commit '
48ba4139b9dc1f53f996b71f509a9d0c6fd2d72b ':
Cherry-pick
f51125d from master to ics-mr0. do not merge.
Raphael [Fri, 28 Oct 2011 18:54:36 +0000 (18:54 +0000)]
am
fe9a2a54 : (-s ours) Cherry-pick
f51125d from master to ics-mr0. do not merge.
* commit '
fe9a2a5471616a3267b30013bce36b13a455c0cd ':
Cherry-pick
f51125d from master to ics-mr0. do not merge.
Raphael [Fri, 28 Oct 2011 00:01:31 +0000 (17:01 -0700)]
Cherry-pick
f51125d from master to ics-mr0. do not merge.
AAPT fix printf %zd crash on Windows.
There's no printf %zd on Mingw/Cygwin so the verbose
printf crashes aapt.
SDK bugs: 20395, 20986
Change-Id: Ic201faffd871bd4c1b7d173d84b089e09750cd85