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

281 Commits

Author SHA1 Message Date
Brian Carlstrom
33d0392d3e Restore write_delete_file 
(cherry picked from commit 5baa164aec06a9973a68303bc7752aa76e5c68e5)

Change-Id: Ifa9a157346edd479ce03982baf435ab213dc2e79
 2015-01-14 20:39:26 -08:00
Christopher Tate
33194035a5 am 49138184: am 9568307c: am 43a4a8c7: Fix redundant file backups 
* commit '49138184dee54357b1923f302e4b3fedd73ca34f':
  Fix redundant file backups
 2015-01-15 04:30:34 +00:00
Christopher Tate
49138184de am 9568307c: am 43a4a8c7: Fix redundant file backups 
* commit '9568307cf32c8abc6703dc7a1b0b0fee56c4f8f5':
  Fix redundant file backups
 2015-01-15 01:39:29 +00:00
Christopher Tate
43a4a8c777 Fix redundant file backups 
We'd observed a bug in which an unchanged file was nevertheless
being redundantly transmitted for backup on every backup pass.
The underlying issue turns out to have been the FileBackupHelper
base implementation's logic for diffing the prior-state file
set against the current state, in the case when there had been
deletions of prior files.  In addition, there was also a
parallel bug in which file checksums were not calculated
properly in some cases, leading to at least one additional
redundant backup of the file in question.

Bug 18694053

Change-Id: Ie0dec06486b5fef4624561737019569c85d6b2a0
 2015-01-14 16:36:30 -08:00
Elliott Hughes
c2b7abdbb2 am 1e147221: am d6c475dc: am 595ae39f: Merge "Use more intention-revealing tests for S_ISLNK and S_ISSOCK." 
* commit '1e14722167210e176cc1f6e702f1a7a98271c6d2':
  Use more intention-revealing tests for S_ISLNK and S_ISSOCK.
 2015-01-13 20:32:52 +00:00
Elliott Hughes
1e14722167 am d6c475dc: am 595ae39f: Merge "Use more intention-revealing tests for S_ISLNK and S_ISSOCK." 
* commit 'd6c475dc246b1681f5c9af9e00ac74183812329c':
  Use more intention-revealing tests for S_ISLNK and S_ISSOCK.
 2015-01-13 01:32:37 +00:00
Elliott Hughes
1bf2481233 Use more intention-revealing tests for S_ISLNK and S_ISSOCK. 
Change-Id: Ia7f13eb7d5a36cf2b4c0a253b2b4d7f7af396951
 2015-01-12 14:33:04 -08:00
Adam Lesinski
a76db13fb0 am 347040cf: am 740acf21: am c7801877: Merge "Fix issue where non-resource attributes would cause obtainStyleAttributes to fail" into lmp-mr1-dev 
* commit '347040cf84401601b0d5cbb1d76e4648d1c8a461':
  Fix issue where non-resource attributes would cause obtainStyleAttributes to fail
 2014-12-11 01:38:33 +00:00
Adam Lesinski
347040cf84 am 740acf21: am c7801877: Merge "Fix issue where non-resource attributes would cause obtainStyleAttributes to fail" into lmp-mr1-dev 
* commit '740acf213c56c406132294790fa2fadd0380cfa7':
  Fix issue where non-resource attributes would cause obtainStyleAttributes to fail
 2014-12-11 00:07:02 +00:00
Adam Lesinski
5dce5e67db Fix issue where non-resource attributes would cause obtainStyleAttributes to fail 
A sentinal value of 0x00000000 was used to mark the first time an AttributeFinder
was used. If the resource ID of an attribute was also 0x00000000 (which occurs with
non-resource attributes, like 'style'), then it would be mistaken as the sentinel
start value.

Bug:18421787
Change-Id: I4be353e0f8c940cb6f262d155129f048dcc444ae
 2014-12-10 10:51:48 -08:00
Adam Lesinski
7e74da3172 am e97908d3: Merge commit \'0953ab27\' into manualmerge 
* commit 'e97908d32ee8ea80138d085260a0eac93841c722':
  AAPT: Move private attrs to new type for framework
 2014-12-05 19:16:27 +00:00
Adam Lesinski
e97908d32e Merge commit '0953ab27' into manualmerge 
Change-Id: I36dea45f7571096136ea7bda5e2680bd85a0df32
 2014-12-05 11:06:21 -08:00
Adam Lesinski
63377406f7 am 8e5362f2: am 503071ae: am a2b5067a: Merge "RRO: prevent duplicate system overlays" 
* commit '8e5362f20e2bc41b1dcf130a613b7e0b3cd1db58':
  RRO: prevent duplicate system overlays
 2014-12-04 16:17:12 +00:00
Adam Lesinski
8e5362f20e am 503071ae: am a2b5067a: Merge "RRO: prevent duplicate system overlays" 
* commit '503071ae41374a66f61e53e05a91243473db83b9':
  RRO: prevent duplicate system overlays
 2014-12-04 09:21:45 +00:00
Adam Lesinski
9b624c186c AAPT: Move private attrs to new type for framework 
Private attributes are typically placed after public
attributes in the resource table. Each time a new version
of the Android framework is released, new public attributes
take the place of the private attributes, and the private
attributes are shifted after the new public ones.

This means that any apps built against the newer SDK
may inadvertently be using private attributes on older
devices.

This change moves all private attributes to a completely
different type ID, so there will never be collisions across
versions.

These private attributes are automatically moved to a synthesized
type only for the system resources.

Bug:18263655

Change-Id: I7a850512953fadcc9f3524d509cea30249782db8
 2014-12-03 15:59:20 -08:00
Adam Lesinski
a2b5067aee Merge "RRO: prevent duplicate system overlays" 2014-12-03 17:44:18 +00:00
Adam Lesinski
625fa573b4 am 9438ad15: am e580d661: am e89a2865: Merge changes If2c7e09f,Ie21f227c 
* commit '9438ad1599716176fb6c593e77a2e93b265bbcb5':
  RRO idmap: pad with 0xffffffff, not 0x00000000
  RRO: reintroduce lost ResTable insert of assets
 2014-12-03 00:30:56 +00:00
Adam Lesinski
9438ad1599 am e580d661: am e89a2865: Merge changes If2c7e09f,Ie21f227c 
* commit 'e580d6617f67a1db5eff7ffe5450684cfc7e1a2b':
  RRO idmap: pad with 0xffffffff, not 0x00000000
  RRO: reintroduce lost ResTable insert of assets
 2014-12-02 23:07:43 +00:00
Adam Lesinski
e89a286541 Merge changes If2c7e09f,Ie21f227c 
* changes:
  RRO idmap: pad with 0xffffffff, not 0x00000000
  RRO: reintroduce lost ResTable insert of assets
 2014-12-02 22:52:37 +00:00
Elliott Hughes
476edb5701 am ee46d162: am 08e2fd72: am ff4dd15c: Merge "We HAVE_LITTLE_ENDIAN." 
* commit 'ee46d1621f817d626e8dd42e9ffe7051f4a829eb':
  We HAVE_LITTLE_ENDIAN.
 2014-11-22 08:04:38 +00:00
Elliott Hughes
ee46d1621f am 08e2fd72: am ff4dd15c: Merge "We HAVE_LITTLE_ENDIAN." 
* commit '08e2fd7238c50b5d06af41bc944ee08acb023d51':
  We HAVE_LITTLE_ENDIAN.
 2014-11-22 07:56:46 +00:00
Elliott Hughes
9d074a1fb7 We HAVE_LITTLE_ENDIAN. 
Change-Id: I5b5d0ef3f91fe84d629d2ddac436bd22019edfd4
 2014-11-21 23:36:45 -08:00
Adam Lesinski
d97237071d am 11bdd5b1: Merge commit \'06d8b7b8\' into manualmerge 
* commit '11bdd5b10b5f921b657283fa94463263171218d5':
  Implement back-tracking when searching for attributes in XML or resource bag
 2014-11-17 20:27:32 +00:00
Adam Lesinski
11bdd5b10b Merge commit '06d8b7b8' into manualmerge 
Conflicts:
	core/jni/android_util_AssetManager.cpp

Change-Id: I77b72d0d3ec8184ccd97419e4c76b7d55b1a52ca
 2014-11-17 12:17:16 -08:00
Adam Lesinski
cd6f00c3a0 Merge "Implement back-tracking when searching for attributes in XML or resource bag" into lmp-mr1-dev 2014-11-17 19:39:17 +00:00
Elliott Hughes
32291900ec am 984d81c3: am c34e6359: Merge "bionic\'s struct stat is now POSIX-compliant." 
* commit '984d81c3937d46240fb9645ffa37c5166284a983':
  bionic's struct stat is now POSIX-compliant.
 2014-11-10 22:18:10 +00:00
Elliott Hughes
984d81c393 am c34e6359: Merge "bionic\'s struct stat is now POSIX-compliant." 
* commit 'c34e63598e318c9aa0debde09730a26c64bc1203':
  bionic's struct stat is now POSIX-compliant.
 2014-11-10 22:10:21 +00:00
Elliott Hughes
4da9dc5a62 bionic's struct stat is now POSIX-compliant. 
One less hack needed...

Bug: 18298106
Change-Id: I1e9e5ebf329bd6cbaf3445201f182793ee4871ce
 2014-11-10 10:48:25 -08:00
Andreas Gampe
c6dcf1fd67 am 5bbb52e8: am 189bf056: Merge "Frameworks/base: Fix more warnings" 
* commit '5bbb52e8a4242efeea27921ac3e38cf6f9c56162':
  Frameworks/base: Fix more warnings
 2014-11-09 00:52:52 +00:00
Andreas Gampe
5bbb52e8a4 am 189bf056: Merge "Frameworks/base: Fix more warnings" 
* commit '189bf05616b854f0319c7329a96e63ad374fd6c0':
  Frameworks/base: Fix more warnings
 2014-11-09 00:48:11 +00:00
Andreas Gampe
25df5fba3a Frameworks/base: Fix more warnings 
Exposed by switching the target to Clang, and GCC 4.9 used by
MIPS.

Change-Id: Icb79285ab2306c39c2d381e53ea2e643ee2d2947
 2014-11-07 22:24:57 -08:00
Andreas Gampe
1c0668a3f8 am 83892ecb: Merge "resolved conflicts for merge of 487ae9b8 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp 
* commit '83892ecb5c38f6e8a216e1596cd6a16bf7bd6a55':
  Frameworks/base: Wall Werror in libs/androidfw
 2014-11-07 23:17:40 +00:00
Andreas Gampe
dc9c109af8 resolved conflicts for merge of 487ae9b8 to lmp-mr1-dev-plus-aosp 
Change-Id: I395f184d885a7ef30aa113ab01fcaacc94243008
 2014-11-07 15:14:02 -08:00
Andreas Gampe
2204f0bf56 Frameworks/base: Wall Werror in libs/androidfw 
Turn on -Wall -Werror in libs/androidfw. Fix warnings. Refactor
some code.

Change-Id: I66fe54ace433c15dee5de328b149ca142f74b2dd
 2014-11-07 13:35:05 -08:00
Mårten Kongstad
cb7b63d928 RRO: prevent duplicate system overlays 
System overlays, ie overlays with targetPackage="android", were loaded
twice, which caused all sorts of issues. Ensure they are only loaded
once, which will be during Zygote initialization.

Bug: 17765434
Change-Id: Ia5064045c77f713c58fb78adc3942f6af1abdc93
 2014-11-07 16:08:22 +01:00
Mårten Kongstad
96198ebae8 RRO idmap: pad with 0xffffffff, not 0x00000000 
In the new idmap format (version 0x1), 0x00000000 no longer represents a
non-existing entry: 0xffffffff should be used instead.

Bug: 17765434
Change-Id: If2c7e09feba2224eeafe88fd9230e6392d81b9a7
 2014-11-07 16:08:04 +01:00
Mårten Kongstad
30113131fb RRO: reintroduce lost ResTable insert of assets 
With the recent introduction of AssetManager::appendPathToResTable,
overlay packages were not properly added to the AssetManager, and once
added, were not properly inserted into the ResTable.

Bug: 17765434
Change-Id: Ie21f227c654c98730f74a687d0e16ee2b80e747e
 2014-11-07 16:07:42 +01:00
Adam Lesinski
1adf320606 am 8491c4ea: Merge "Merge commit \'fb96e54\' into manualmerge" into lmp-mr1-dev-plus-aosp 
* commit '8491c4ead7dba5cfd406cf99a511fc1dce07cc4d':
  Add error checking to aapt for split generation
 2014-11-05 20:35:27 +00:00
Adam Lesinski
685d363d7a Merge commit 'fb96e54' into manualmerge 
Conflicts:
	tools/aapt/Resource.cpp

Change-Id: I4147c3550e9426f3429146eaeb16f10ba76b5b15
 2014-11-05 12:30:25 -08:00
Adam Lesinski
a7d1d73a47 Implement back-tracking when searching for attributes in XML or resource bag 
Shared libraries have their package ID assigned at run-time, so some
of the guarantees we used to have about sort order of attributes in
bags or XML elements no longer hold.

This CL adds back-tracking and can jump to the nearest attribute with the
same package ID and continue searching.

This means that attributes with the same package ID must be sorted by increasing
resource ID, as was the case before.

Attributes with the same package ID must be grouped together, but the groups can
be in any order. Ex: 0x02010001, 0x02010002, 0x01010000, 0x01010010, 0x7f010032

Bug:17666947
Change-Id: I9c198bbb6ca788849aac85b6323606ea5d9550d6
 2014-11-04 16:34:34 -08:00
Adam Lesinski
24655f37ed am 3fd34002: Merge commit \'78be0498\' into manualmerge 
* commit '3fd340028fc24198edb23ddf5eb5a0a100bab745':
  Fix issues that will be present in C++11
 2014-11-04 02:14:37 +00:00
Adam Lesinski
3fd340028f Merge commit '78be0498' into manualmerge 
Conflicts:
	libs/androidfw/ResourceTypes.cpp
	tools/aapt/Android.mk
	tools/aapt/StringPool.cpp
	tools/aapt/StringPool.h

Change-Id: I9d69efdfb892032895ace12159d193304f02dc6c
 2014-11-03 18:06:22 -08:00
Adam Lesinski
de7de47fef Add error checking to aapt for split generation 
Change-Id: Ica627db6a671f6a6c35f98bfd9c03598ffe103ce
 2014-11-03 15:55:44 -08:00
Adam Lesinski
668f0a356c Merge "Fix issues that will be present in C++11" into lmp-mr1-dev 2014-11-03 23:38:43 +00:00
Adam Lesinski
4bf58108d4 Fix issues that will be present in C++11 
- char16_t is a distinct type, so stay consistent
  with it throughout the code base.
- char16_t is defined as minimum size of 16 bits.
  Since we mmap and cast data structures onto raw memory,
  we need a precise definition (uint16_t), so we cast between
  that (and static_assert that they are the same size).

Change-Id: I869c32637543bbcfb39d2643e7d9df10d33acd3c
 2014-11-03 11:49:47 -08:00
Alan Viverette
f2ae40739a am 9a77c8a2: am 3c5cc234: am 674a3a21: Merge "Distinguish unspecified and explicit null values in resources" into lmp-mr1-dev 
* commit '9a77c8a279bfe3293295ed77c775ea29b88b2916':
  Distinguish unspecified and explicit null values in resources
 2014-10-31 00:25:37 +00:00
Alan Viverette
9a77c8a279 am 3c5cc234: am 674a3a21: Merge "Distinguish unspecified and explicit null values in resources" into lmp-mr1-dev 
* commit '3c5cc234eeef4a08ad7b00b4e869a1e47cf14ab3':
  Distinguish unspecified and explicit null values in resources
 2014-10-31 00:15:01 +00:00
Alan Viverette
f296940502 Distinguish unspecified and explicit null values in resources 
BUG: 17919345
Change-Id: Ic4f04f7dd0f986f58a749b5950d80c1cfdb074ea
 2014-10-29 17:09:36 -07:00
Adam Lesinski
6d2268420d am d75d3eb5: am 31b76b66: Merge "libandroidfw: Do not build device library when building SDK" into lmp-mr1-dev automerge: 06caf1b 
* commit 'd75d3eb5e423fbcc069dd3c40a4a5eeeaf8bcdab':
  libandroidfw: Do not build device library when building SDK
 2014-10-28 19:06:00 +00:00
Adam Lesinski
d75d3eb5e4 am 31b76b66: Merge "libandroidfw: Do not build device library when building SDK" into lmp-mr1-dev 
automerge: 06caf1b

* commit '06caf1b1112a6a3e364a46d02b883451e9180a07':
  libandroidfw: Do not build device library when building SDK
 2014-10-28 18:09:20 +00:00