| 08b3d2e5ef01a5114424a871934dd9fc153352c0 |
06-May-2010 |
Dan Egnor <egnor@google.com> |
Make static versions of libutils and libbinder.
Fix some small static-initialization-order issues (and a static-
initializers-missing issue) that result from doing so. The static
libraries don't actually get used for anything real at the moment --
they're used for perf tests of bug 2660235.
Bug: 2660235
Change-Id: Iee2f38f79cc93b395e8d0a5a144ed92461f5ada0
ndroid.mk
tring8.cpp
|
| 966fcb81eece9096040ccc185bb662335d3964cf |
31-Mar-2010 |
Dianne Hackborn <hackbod@google.com> |
Revert "fix [2542425] memory leak during video recording"
This reverts commit 544592e14f8d7643238e40ba9879727497900f35.
ectorImpl.cpp
|
| 544592e14f8d7643238e40ba9879727497900f35 |
31-Mar-2010 |
Mathias Agopian <mathias@google.com> |
fix [2542425] memory leak during video recording
[Sorted|Keyed]Vector<TYPE> would leak their whole storage when resized
from the end and TYPE had trivial dtor and copy operators.
Change-Id: I8555bb1aa0863df72de27d67ae50e20706e90cf5
ectorImpl.cpp
|
| d74145285373193af8584ac86ee73c7aea3e1600 |
29-Mar-2010 |
Mathias Agopian <mathias@google.com> |
fix [2542425] memory leak during video recording
Vector::sort() is using _do_copy() incorrectly; _do_copy() calls the
copy constructor, not the assignment operator, so we need to destroy
the "destination" before copying the item.
Change-Id: Iaeeac808fa5341a7d219edeba4aa63d44f31473c
ectorImpl.cpp
|
| cf244ada58539ce857ec041d7288d0271204fbb6 |
10-Mar-2010 |
Dianne Hackborn <hackbod@google.com> |
Add ability for some manifest attributes to reference resources.
This loosens our restriction on many manifest attributes requiring
literal string values, to allow various ones to use values from
resources. This is only allowed if the resource value does not change
from configuration changes, and the restriction is still in place
for attributes that are core to security (requesting permissions) or
market operation (used libraries and features etc).
Change-Id: I4da02f6a5196cb6a7dbcff9ac25403904c42c2c8
esourceTypes.cpp
|
| 20cb56e26e91df91bd64d4251222e0d421cdbe47 |
04-Mar-2010 |
Dianne Hackborn <hackbod@google.com> |
Fix some bugs.
Bug #2376231: Apps lose window focus (and back key causes ANR) if the
lock screen is dismissed while the phone is in landscape mode
This is another case where we weren't recomputing the focused window
after changing the visibility policy.
bug #2479958: Investigate source of "Resources don't contain package
for resource number 0x7f0a0000"
Um, okay, so it turns out there were bugs all over the place where
we would load an XML resource from a another application, but not
use the Resources for that application to retrieve its resources...!
I think the only reason any of this stuff was working at all was
because it typically only cared about retrieving the resource
identifiers of the items (it would look up the values later).
Bug #2401082: Passion ERE26 monkey crash - InputMethodManagerService
Add some null checks.
esourceTypes.cpp
|
| ef05e076ced1a32c5c0aaee28403779834adb2ba |
02-Mar-2010 |
Dianne Hackborn <hackbod@google.com> |
Fix issue #2448075: aapt doesn't fix up activity-alias android:targetActivity links
And related:
- The aapt tool now sets a resource configurations sdk level to match any configs
that have been set (for example if you specify density your sdk level will be
at least 4).
- New option to modify the targetPackage attribute of instrumentation.
- Clean up of aapt options help.
- Fix of UI type values to leave 0 for "unspecified".
- Make the UI mode config APIs public.
esourceTypes.cpp
|
| 56c0952a1f200665934a4d11975d0feb832f9908 |
02-Mar-2010 |
Ficus Kirkpatrick <ficus@android.com> |
Demote the famous ResourceTypes warning to LOGV.
It is spamming the log bigtime and can be promoted back to LOGW
or worse by whoever decides to actually investigate the bug.
Change-Id: I72d950155378f641ebdfbacabae774f5736a52bc
esourceTypes.cpp
|
| 780d2a1b714724d85227141c76b3c64f543f00b4 |
23-Feb-2010 |
Kenny Root <kroot@google.com> |
Use UTF-8 strings to avoid duplicate caching, part 1
StringBlock instances containing UTF-8 strings use a cache to convert
into UTF-16, but using that cache and then using a JNI call to NewString
causes the UTF-8 string as well as two copies of the UTF-16 string to
be held in memory. Getting the UTF-8 string directly from the StringPool
eliminates one copy of the UTF-16 string being held in memory.
This is part 1. Part 2 will include ResXMLParser optimizations.
Change-Id: Ibd4509a485db746d59cd4b9501f544877139276c
esourceTypes.cpp
|
| c86727f5805f28fbd25da141c50fb6843f364f3a |
12-Feb-2010 |
Mathias Agopian <mathias@google.com> |
remove a dependency of GraphicBuffer (libui) on Parcel (libbinder).
Add a Flattenable interface to libutils which can be used to flatten
an object into bytestream + filedescriptor stream.
Parcel is modified to handle Flattenable. And GraphicBuffer implements
Flattenable.
Except for the overlay classes libui is now independent of libbinder.
ndroid.mk
lattenable.cpp
|
| a9886c580b299984e62303a995bf7b13276b5bc8 |
12-Feb-2010 |
Kenny Root <kroot@google.com> |
Totally remove Unicode.cpp and rely on ICU
Unicode.cpp used a packed data table for character data that essentially
duplicated ICU's functionality.
Change-Id: Ia68fe4ac94e89dc68d9a3f45f33f6e648a5500b7
ndroid.mk
haracterData.h
nicode.cpp
|
| 564bfc27f253694183f5972cdda6357c66bd7bbd |
12-Feb-2010 |
Kenny Root <kroot@google.com> |
Excise code from Unicode.cpp that was dead
Remove some utility functions for discovering character data
that ICU probably took over a while ago.
Change-Id: I97abe4de2f51eb2bf48679941258bc501184c3dc
haracterData.h
nicode.cpp
|
| bb79f64b89bd7be7019035a0347c681e6f39fe6b |
10-Dec-2009 |
Kenny Root <kroot@google.com> |
Add string resource type inspection
Allows "aapt dump --values resource" to print out whether a string in a
ResStringPool is in UTF-8 or UTF-16 encoding.
Change-Id: I6478884a70a3b46fee862dece6cb33454fc34843
esourceTypes.cpp
|
| afbeb31bffd54ecd332da5d3751b42da02b62330 |
09-Dec-2009 |
Dianne Hackborn <hackbod@google.com> |
Maybe really fix windows build.
hreads.cpp
|
| 06fb2c1c398d91787440978bf358bb9808cc2928 |
09-Dec-2009 |
Dianne Hackborn <hackbod@google.com> |
Hopefully fix Windows build
hreads.cpp
|
| e6c0e99334bc2f47e5d36db253ac8f166047c03b |
08-Dec-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change I129483f8 into eclair-mr2
* changes:
Optional use of UTF-8 strings in resource bundles
|
| 887f355f99ff83d568ef2885a4fdcaae475583df |
08-Dec-2009 |
Dianne Hackborn <hackbod@google.com> |
Propagate background scheduling class across processes.
This is a very simply implementation: upon receiving an IPC, if the handling
thread is at a background priority (the driver will have taken care of
propagating this from the calling thread), then stick it in to the background
scheduling group. Plus an API to turn this off for the process, which is
used by the system process.
This also pulls some of the code for managing scheduling classes out of
the Process JNI wrappers and in to some convenience methods in thread.h.
hreads.cpp
|
| 19138468caf7050d482dc15f35a344eab11bb756 |
04-Dec-2009 |
Kenny Root <kroot@google.com> |
Optional use of UTF-8 strings in resource bundles
Allows the use of UTF-8 for packing resources instead of the
default of UTF-16 for Java. When strings are extracted from the
ResStringPool, they are converted to UTF-16 and the result is
cached for subsequent calls.
When using aapt to package, add in the "-8" switch to pack the
resources using UTF-8. This will result in the value, key, and
type strings as well as the compiled XML string values taking
significantly less space in the final application package in
most scenarios.
Change-Id: I129483f8b3d3b1c5869dced05cb525e494a6c83a
esourceTypes.cpp
tring16.cpp
tring8.cpp
|
| b8d81679553ee33f6ae5281310abf2effca4ffcd |
20-Nov-2009 |
Dianne Hackborn <hackbod@google.com> |
Debugging for issue #2228381 android.view.InflateException
Binary XML file line #37: Error inflating class <unknown> after adding a secondary account
Now that I have these debug logs, I want to keep them since they will make
debugging these kinds of issues a lot easier in the future. (Note in this
case there was no problem in the framework.)
Change-Id: If2b0bbeda4706b7c5dc1ba4a5db04b74f40e1543
esourceTypes.cpp
|
| 436344ae12c819f58306ceb94241a266141e1218 |
01-Oct-2009 |
Christopher Tate <ctate@android.com> |
Turn off most of the backup-related debug logging
The core logging in BackupManagerService and in the Google backup transport are
still enabled at this point.
Change-Id: I10abfa565bbd1097dd3631051b6aca163e4af33a
ackupData.cpp
|
| 119376ed49ff118a59b955b66b09ad57ce54587d |
28-Sep-2009 |
Doug Zongker <dougz@android.com> |
fix "pacakge" typo in error log message
esourceTypes.cpp
|
| 4cc86e1ae80eb1938500fe5fa06bbdf8b4b7b50d |
22-Sep-2009 |
Christopher Tate <ctate@android.com> |
Clear the device's data from the transport when backup is disabled
Turning off backup in the Settings UI constitutes an opt-out of the whole
mechanism. For privacy reasons we instruct the backend to wipe all of the data
belonging to this device when the user does this. If the attempt fails it is
rescheduled in the future based on the transport's requestBackupTime()
suggestion. If network connectivity changes prompt the transport to indicate a
backup pass is appropriate "now," any pending init operation is processed before
the backup schedule is resumed.
The broadcasts used internally to the backup manager are now fully protected;
third party apps can neither send nor receive them.
(Also a minor logging change; don't log 'appropriate' EOF encountered during
parsing of a backup data stream.)
ackupData.cpp
|
| 6cca1599f78549716ef120245e54fa1961976dda |
20-Sep-2009 |
Dianne Hackborn <hackbod@google.com> |
Fix issue #1862317: Browser does not appear to honor anchors (#es) in links
Also a little improved debugging output of bad resource identifiers.
Change-Id: I054064ef22855608ffd722e4ccf12ce57d1992b2
esourceTypes.cpp
|
| d42bd87f23974164d2539ea85c7b5e6329faf2c2 |
09-Sep-2009 |
Mathias Agopian <mathias@google.com> |
use broadcast() instead of signal() when signaling the condition-variable Thread::RequestExitAndWait() is waiting for
we could have several thread waiting on the condition and they all need to wake-up.
also added a debug "mTid" field in the class, which contains the tid of the thread (as opposed to pthread_t), this
is useful when debugging under gdb for instance.
hreads.cpp
|
| c87d25215c842cea370c6a86ce67585fa8da4900 |
02-Sep-2009 |
Eric Fischer <enf@google.com> |
Make it an error to use a bare apostrophe in aapt, and adjust warnings/errors.
In practice, no one ever writes an apostrophe in an aapt string with the
intent of using it to quote whitespace -- they always mean to include a
literal apostrophe in the string and then are surprised when they find
the apostrophe missing. Make this an error so that it is discovered
right away instead of waiting until late in QA or after the strings have
already been sent for translation. (And fix a recently-introduced string
that has exactly this problem.)
Silence the warning about an empty span in a string, since this seems to
annoy people instead of finding any real problems.
Make the error about having a translated string with no base string into
a warning, since this is a big pain when making changes to an application
that has already had some translations done, and the dead translations
should be removed by a later translation import anyway.
esourceTypes.cpp
|
| 90f77218a24ac66bea52faef79c30d45420ce135 |
12-Aug-2009 |
Dianne Hackborn <hackbod@google.com> |
am b8546001: Merge change 20878 into donut
Merge commit 'b8546001701405a76dad7e6235046e592296fac2'
* commit 'b8546001701405a76dad7e6235046e592296fac2':
Fix issue #2048263: More debugging information
|
| 82e1ee93eece8fb0aec6acc3ef4ee7b1c86feec7 |
12-Aug-2009 |
Dianne Hackborn <hackbod@google.com> |
Fix issue #2048263: More debugging information
We now hopefully do better about generating the anr reports, and include
information about the malloc loaded assets in meminfo.
sset.cpp
|
| 078a2757847dcdd50a254d973d2c9a0556e98d75 |
01-Aug-2009 |
David 'Digit' Turner <digit@google.com> |
Fix Win32 libutils to get a working SDK build.
hreads.cpp
|
| afcf686cb070313ae5ce6c54ac381a3a86a60ed2 |
31-Jul-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
am 25dff70f: Merge change 9039 into donut
Merge commit '25dff70f153529b87f5ad4a92f4de21e8950b1de'
* commit '25dff70f153529b87f5ad4a92f4de21e8950b1de':
Fix #2018814: System cannot correctly render assets with "wrap_content" attribute in QVGA
|
| 0d221012ff5fd314711c00ed30e9b807b9c454c1 |
30-Jul-2009 |
Dianne Hackborn <hackbod@google.com> |
Fix #2018814: System cannot correctly render assets with "wrap_content" attribute in QVGA
It turns out we were not returning the density for anything retrieved from a
TypedArray... which basically means any bitmap references from a layout or style...!!!
This is now fixed.
Also fiddle with the density compatibility mode to turn on smoothing in certain situations,
helping the look of things when they need to scale and we couldn't do the scaling at
load time.
esourceTypes.cpp
|
| 9bb8fd77c8dc177aab9ac96bed4f55972dcda70a |
29-Jul-2009 |
Joe Onorato <joeo@android.com> |
Only restore the bits for wallpapers that aren't built in.
ackupData.cpp
|
| 8d72569e3b85a352afe0fe1125b784d2ac13cde1 |
29-Jul-2009 |
Joe Onorato <joeo@android.com> |
Fix the IOException in wallpaper restore -- the padding isn't required at the end.
ackupData.cpp
|
| a8339dfec9d1b2c6d6fd2f8268f8075d184f64c0 |
22-Jul-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
am 9fc20b0e: Merge change 8126 into donut
Merge commit '9fc20b0e381b5fe00b7049ef357c839cd05a33bf'
* commit '9fc20b0e381b5fe00b7049ef357c839cd05a33bf':
First pass at reworking screen density/size APIs.
|
| c4db95c077f826585d20be2f3db4043c53d30cf5 |
22-Jul-2009 |
Dianne Hackborn <hackbod@google.com> |
First pass at reworking screen density/size APIs.
This changes the names of the directories in aapt, to what you see
in the list of DpiTest resources. Also adds a new "long" configuration
for wide screens, which the platform sets appropriate, and introduces
a new kind of resizeability for not large but significantly larger
than normal screens which may have compatibility issues.
esourceTypes.cpp
|
| 469b4c67adc77a87eb2c9ed9217edf1778002828 |
20-Jul-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
am aad0fcc9: Merge change 7783 into donut
Merge commit 'aad0fcc9619eb72c18a6afff48ebc9d4011f0f54'
* commit 'aad0fcc9619eb72c18a6afff48ebc9d4011f0f54':
Add "nodpi" density, and expose a bunch of density-related APIs.
|
| a53b828635fce8b6b2d3e3377d74d72070056623 |
17-Jul-2009 |
Dianne Hackborn <hackbod@google.com> |
Add "nodpi" density, and expose a bunch of density-related APIs.
Also update the DpiTest app to use nodpi images, and try to have a mode
where it turns off compatibility though it's not quite working.
esourceTypes.cpp
|
| 3d88fc00b32cc4c093dd5ef3f8f349966df948ad |
17-Jul-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
am 3e1663a2: Merge change 7536 into donut
Merge commit '3e1663a2539ff0b939193304cfb601f6b134af7d'
* commit '3e1663a2539ff0b939193304cfb601f6b134af7d':
fix FILE* version of ZipUtils::inflateToBuffer
|
| d2792e3768d41c4b366fccf9c8b415c61761f4af |
16-Jul-2009 |
Doug Zongker <dougz@android.com> |
fix FILE* version of ZipUtils::inflateToBuffer
This can't have ever worked; a successful fread() was returning 1
instead of getSize.
ipUtils.cpp
|
| ee5bbb7f6304c4930899d069c82fe02e49f050aa |
13-Jul-2009 |
Joe Onorato <joeo@android.com> |
Need to skip the padding after reading.
m_dataEndPos points to the end of the data, not the beginning
of the next entity.
ackupData.cpp
|
| b1c4ca5ad21ae63cd5af2cfc1be82ba176d25195 |
13-Jul-2009 |
Mathias Agopian <mathias@google.com> |
implement Mutex and Condition with pthread instead of calling futex directly.
internally pthread uses futex. the implementation consists of simple inlines
there are no implementation files anymore.
ndroid.mk
hreads.cpp
utex_synchro.c
|
| 58e8131631b4598d445303183ee6ea80b7e63038 |
09-Jul-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
am be91fdbc: Merge change 6665 into donut
Merge commit 'be91fdbc5c4f2de3a2bb574a98fdfeef44d8cdb5'
* commit 'be91fdbc5c4f2de3a2bb574a98fdfeef44d8cdb5':
Fix resources not being set correctly.
|
| c916e0616468e74a87cec71cefd26150a108edf1 |
09-Jul-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
am fe811d8b: Merge change 6603 into donut
Merge commit 'fe811d8bd0da15f14702968a9c7deb02db7eec9f'
* commit 'fe811d8bd0da15f14702968a9c7deb02db7eec9f':
quick fix; utf8_codepoint_count must be utf8_length
|
| e2bf80fb0bfd944ef45d60bdc469d85734527363 |
09-Jul-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
am 8a715b4b: Merge change 5510 into donut
Merge commit '8a715b4b791db4390d12e0ded02280592634a424'
* commit '8a715b4b791db4390d12e0ded02280592634a424':
Add useful functions to String8, which enables users to convert between UTF-8 and UTF-32
|
| 6c11e73f678a46b0a74c6f1936eebd51dc60f0af |
09-Jul-2009 |
Dianne Hackborn <hackbod@google.com> |
Fix resources not being set correctly.
esourceTypes.cpp
|
| 361d477957feb07454b93509da0bfd05e9c718a8 |
09-Jul-2009 |
Daisuke Miyakawa <dmiyakawa@google.com> |
quick fix; utf8_codepoint_count must be utf8_length
tring8.cpp
|
| f05b33b3a1cff40972a735ff1fb4ed6e8bfeaf2a |
30-Jun-2009 |
Daisuke Miyakawa <dmiyakawa@google.com> |
Add useful functions to String8, which enables users to convert between UTF-8 and UTF-32
It will be used in SQL functions in external/sqlite/android.
See https://android-git.corp.google.com/g/Gerrit#change,5511 for example.
Related internal bug id: 1707173
tring8.cpp
|
| 17ffe1018c506272da45be6b35caf859bc2582f1 |
06-Jul-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
am 991eec03: Merge change 6252 into donut
Merge commit '991eec03a73f8803d0f8c80b418480ea25293cfb'
* commit '991eec03a73f8803d0f8c80b418480ea25293cfb':
Don't re-parse the framework resources all the time.
|
| 78c405178c57bb45e40f1e2839d6a18d91f7f02c |
06-Jul-2009 |
Dianne Hackborn <hackbod@google.com> |
Don't re-parse the framework resources all the time.
A small optimization to the resource code, to not re-parse the framework
resources every time we build a new AssetManager. Instead, you can now
construct a ResTable from a previously created one... of course, like the
existing code for using the data in-place, you can't delete the original
ResTable until you have deleted the one that has been constructed from it.
sset.cpp
ssetManager.cpp
esourceTypes.cpp
|
| d96e0b0cf14f159d96502a4caf8aa2a33c334a99 |
02-Jul-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
am 6e1647a2: Merge change 5829 into donut
Merge commit '6e1647a212317f4ee8bcc23948b6621a59172954'
* commit '6e1647a212317f4ee8bcc23948b6621a59172954':
Fix issue #1673793: Theme styles don't apply.
|
| de7faf658cd40d34c08a98b39477055da8e19172 |
30-Jun-2009 |
Dianne Hackborn <hackbod@google.com> |
Fix issue #1673793: Theme styles don't apply.
It turns out this was not a problem in the resource code at all. Rather,
the system process has a cache of pre-loaded attributes it uses to avoid
continually reloading things as it needs them. Well it turns out this
cache wasn't flushed after a package was uninstalled or a configuration
changed, so you could re-install an app where you change its style resources
so its theme now points to one that is inconsistent in the cache.
This is mostly a problem for developers, where they continually install
new versions of an app where resources have changed. This could possibly
show up when updating an app on a normal phone, although the problem would
eventually correct itself since this cache uses weak references.
Anyway, the cache is now reworked to be flushed appropriately.
This change also includes an update to aapt to be able to dump the
contents of bags in resources.
esourceTypes.cpp
|
| bacc51026e8c95f34830defdfc1be4b359abf664 |
30-Jun-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
am d09f86ce: Merge changes 5548,5549 into donut
Merge commit 'd09f86ce175fad6ddbd446363f327dfa0575a1d2'
* commit 'd09f86ce175fad6ddbd446363f327dfa0575a1d2':
Better (and less) logging from backup.
Add an extra null terminator. String8::unlockBuffer is
|
| f6ff591decdea6299aab1a5b6f95917800571de4 |
30-Jun-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
am 72eb0aca: Merge change 5483 into donut
Merge commit '72eb0acad5cffc57ce5006f6deab29ee259e461e'
* commit '72eb0acad5cffc57ce5006f6deab29ee259e461e':
Expand support for different screen sizes.
|
| d09f86ce175fad6ddbd446363f327dfa0575a1d2 |
26-Jun-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge changes 5548,5549 into donut
* changes:
Better (and less) logging from backup.
Add an extra null terminator. String8::unlockBuffer is supposed to be doing this, but it's not and I can't figure out why. This makes BackupHelperDispatcher able to read the keys correctly.
|
| 568bc32344dce841c8f6958f1a65ff839a1b64c0 |
26-Jun-2009 |
Joe Onorato <joeo@android.com> |
Better (and less) logging from backup.
ackupData.cpp
ackupHelpers.cpp
|
| 723738cfaec3dd7b0fe152c872c41bebf94074c4 |
26-Jun-2009 |
Dianne Hackborn <hackbod@google.com> |
Expand support for different screen sizes.
Applications can now declare that they support small, normal, or
large screens. Resource selection can also be done based on these
sizes. By default, pre-Donut apps are false for small and large,
and Donut or later apps are assumed to support all sizes. In either
case they can use <supports-screens> in their manifest to declare
what they actually support.
esourceTypes.cpp
|
| 60965876d81bc7c327a6fd8360b46a85e3d9f4de |
25-Jun-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
am df65b60c: Merge change 5243 into donut
Merge commit 'df65b60ce33e5a56815864f8f0713e25378fa649'
* commit 'df65b60ce33e5a56815864f8f0713e25378fa649':
Only report "unknown metadata" once per restore helper
|
| 9c73a336c121ae2a1f608700b45d84fed6c49eba |
25-Jun-2009 |
Christopher Tate <ctate@google.com> |
am 54118adb: Put back LOGP -> printf in the backup helper code
Merge commit '54118adb3766fdf73a409102b88d7494bb6889a3'
* commit '54118adb3766fdf73a409102b88d7494bb6889a3':
Put back LOGP -> printf in the backup helper code
|
| 95cb30d2e99393023e0df8f804b5856513d315aa |
25-Jun-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
am 0e034e5a: Merge change 5162 into donut
Merge commit '0e034e5a9a71e5e196baff630dca796a0e3ed3e2'
* commit '0e034e5a9a71e5e196baff630dca796a0e3ed3e2':
Preserve file access mode when backing up / restoring files
|
| 63bcb79dd437e70593b63cc5a87baab3251c2183 |
24-Jun-2009 |
Christopher Tate <ctate@google.com> |
Only report "unknown metadata" once per restore helper
Also removes the auto-free object, replacing it with direct memory manipulation.
ackupHelpers.cpp
|
| 54118adb3766fdf73a409102b88d7494bb6889a3 |
24-Jun-2009 |
Christopher Tate <ctate@google.com> |
Put back LOGP -> printf in the backup helper code
ackupHelpers.cpp
|
| fbb92385f2fb0ae1146bb8f3d73547d90bda6db1 |
24-Jun-2009 |
Christopher Tate <ctate@google.com> |
Preserve file access mode when backing up / restoring files
This change adds a fixed-size metadata block at the head of each file's content
entity. The block is versioned, and fixed-size on the theory that it might be
nice to be able to recover the content (if not the full metadata) of the files
if we're ever confronted with data backed up some hypothetical future helper
that stored expanded metadata.
The net effect is that now on restore, we assign the same access mode to the
file that it originally had when backed up.
Also, some of the code was failing to properly free transient heap-based buffers
when it encountered errors. This has been fixed with the addition of a tiny
stack-based object whose job it is to free() its designated pointer from its
destructor.
ackupHelpers.cpp
|
| 9bfd5f495bdc0d704d85fa95b67845099d9b9f48 |
23-Jun-2009 |
Christopher Tate <ctate@google.com> |
am 11b15779: Add file mode to the file-backup saved state blobs
Merge commit '11b157790234d3d2f116ce4c7ed1d3d00fb78bc3'
* commit '11b157790234d3d2f116ce4c7ed1d3d00fb78bc3':
Add file mode to the file-backup saved state blobs
|
| 11b157790234d3d2f116ce4c7ed1d3d00fb78bc3 |
23-Jun-2009 |
Christopher Tate <ctate@google.com> |
Add file mode to the file-backup saved state blobs
This change puts the file's access mode into the saved-state blob used by the
file backup helpers. The tests have been updated for the new blob content
format.
What this change *doesn't* do is actually backup/restore the file mode. This
change is a prerequisite for that, but mode preservation in backup/restore will
require adding metadata to the backup data stream itself, so will be approached
a bit more carefully.
(Also fixed one outright bug in the test program: ReadEntityData() had been
changed to return a ssize_t union of either a byte-count or a negative number
indicating error, but the test program was still assuming that nonzero == error,
and was spuriously failing.)
ackupHelpers.cpp
|
| 69d13f6680c19a39a849484403495daf388416ea |
22-Jun-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
am 72be4049: Merge change 4910 into donut
Merge commit '72be40490951d3f9d0ada16fcf5288d0c3306d88'
* commit '72be40490951d3f9d0ada16fcf5288d0c3306d88':
fix warnings that will show up with GCC 4.4 (in master)
|
| 72be40490951d3f9d0ada16fcf5288d0c3306d88 |
22-Jun-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change 4910 into donut
* changes:
fix warnings that will show up with GCC 4.4 (in master)
|
| 4527acb0c39258792ae55604cb4d71006bf8d938 |
22-Jun-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
am 856dd8a6: Merge change 4952 into donut
Merge commit '856dd8a60a70a5b7dca2bf2114872ce063e2ad60'
* commit '856dd8a60a70a5b7dca2bf2114872ce063e2ad60':
Helper API cleanup. Allows multiple helpers to function,
|
| 06290a4bb9b280fa14a2bbeb2d3ceb09396a78c3 |
19-Jun-2009 |
Joe Onorato <joeo@android.com> |
Helper API cleanup. Allows multiple helpers to function,
because they'll always go in the same order, and this lets
us not have to write headers to keep them paired.
ackupData.cpp
|
| 5f91097b26f036a45e32f4e4cae3e9e135a6042d |
22-Jun-2009 |
Mathias Agopian <mathias@google.com> |
fix warnings that will show up with GCC 4.4 (in master)
esourceTypes.cpp
|
| fc68623c03439db95401a18a435dbc491cd7f6fd |
20-Jun-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
am 1585bd24: Merge change 4828 into donut
Merge commit '1585bd24c10d16351f89e32dddbfa799f18db6bd'
* commit '1585bd24c10d16351f89e32dddbfa799f18db6bd':
Report densities in badging, debugging for nine patch bug.
|
| e17086ba346009a26cc2299b133a0fe602acb6ec |
20-Jun-2009 |
Dianne Hackborn <hackbod@google.com> |
Report densities in badging, debugging for nine patch bug.
The aapt tool now reports all available densities like it already did
for locales. Also this includes more resource data output, which I
was using to examine bug #1867049 (which at this point I am unable to
reproduce).
esourceTypes.cpp
|
| f923ed6ff76a0fd022bcc83e748e82266ba4ed1b |
19-Jun-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
am 5502f04c: Merge change 4709 into donut
Merge commit '5502f04c1dcf2b1918858bacb99fb0480a711707'
* commit '5502f04c1dcf2b1918858bacb99fb0480a711707':
backup stuff
|
| 1c14776a13546fc2642baa251c8f1b7c545b0272 |
19-Jun-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
am 16ce3504: Merge change 4708 into donut
Merge commit '16ce3504c5bf98d95d5c36001f755bb4b15253c9'
* commit '16ce3504c5bf98d95d5c36001f755bb4b15253c9':
Make RestoreHelper and friends also write out the snapshot state.
|
| 5d605dc56b036232e885f6ec36b888b729673060 |
19-Jun-2009 |
Joe Onorato <joeo@android.com> |
backup stuff
ackupData.cpp
ackupHelpers.cpp
|
| d2d9ceb7305d593c1b767bbb05de0082a9af4109 |
18-Jun-2009 |
Joe Onorato <joeo@android.com> |
Make RestoreHelper and friends also write out the snapshot state.
ackupHelpers.cpp
|
| 6f8b5c12d3a3a02c5d38e3f54117cb6d65e0d4a6 |
18-Jun-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
am de72697b: Merge change 4524 into donut
Merge commit 'de72697b771d33738c5f9d6c28087504e0796622'
* commit 'de72697b771d33738c5f9d6c28087504e0796622':
FileRestoreHelper and RestoreHelperDispatcher work.
|
| efd0fab04b96d7ab0c1d8bf3b79397c8621e31c5 |
18-Jun-2009 |
Joe Onorato <joeo@android.com> |
FileRestoreHelper and RestoreHelperDispatcher work.
ackupData.cpp
|
| 251c89c0a7502f4286f2484a77b685ddfe2b39d2 |
18-Jun-2009 |
Joe Onorato <joeo@android.com> |
am 5f15d151: checkpoint BackupDatAInput / RestoreHelper
Merge commit '5f15d151b5101fadfe6cba1e8f4aa6367e8c603e'
* commit '5f15d151b5101fadfe6cba1e8f4aa6367e8c603e':
checkpoint BackupDatAInput / RestoreHelper
|
| 5f15d151b5101fadfe6cba1e8f4aa6367e8c603e |
16-Jun-2009 |
Joe Onorato <joeo@android.com> |
checkpoint BackupDatAInput / RestoreHelper
ackupData.cpp
ackupHelpers.cpp
|
| daf701fa6250ae89ad93e2e41127e0f676a322a5 |
15-Jun-2009 |
Christopher Tate <ctate@google.com> |
am 2fdd428e: Fix some backup reader/writer issues; make local transport do backup
Merge commit '2fdd428e0f18384160f7c38ce3a2cd9ba7e7b2c2'
* commit '2fdd428e0f18384160f7c38ce3a2cd9ba7e7b2c2':
Fix some backup reader/writer issues; make local transport do backup
Fix the jni initializer.
Add RestoreFileHelper, BackupDataInput, and add java wrappers for the methods on BackupDataOutput.
Fix bug #1812041: activity manager crash with bad args.
Journal backup requests so that they won't be lost in a crash
Fix data connection issues.
|
| 1cf587496fcb1d652bab9fc6792fb106b6fefaa4 |
12-Jun-2009 |
Joe Onorato <joeo@android.com> |
Add RestoreFileHelper, BackupDataInput, and add java wrappers for the methods on BackupDataOutput.
ackupData.cpp
|
| bf85d63cb8858432ff845250fdaffdb556d2ef1b |
12-Jun-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
am 78f0f8cb: Merge changes 3953,3954 into donut
Merge commit '78f0f8cb2efe9410127c39201e240f6d438eb53c'
* commit '78f0f8cb2efe9410127c39201e240f6d438eb53c':
Make the file backup helper not crash if a file you requested
Fix SharedPrefsBackupHelper so it doesn't hard code the paths to the files.
|
| ce88cb15b52998e16c3ba548a4ec49117a835e21 |
11-Jun-2009 |
Joe Onorato <joeo@android.com> |
Make the file backup helper not crash if a file you requested
can't be stated. This means you don't need to know if the files
you are backing up exist or not -- we'll figure it out for you.
ackupHelpers.cpp
|
| 23ecae3bbb60c5af940f3a22170d75eb6ac05b69 |
11-Jun-2009 |
Joe Onorato <joeo@android.com> |
Fix SharedPrefsBackupHelper so it doesn't hard code the paths to the files.
This took quite a bit of refactoring.
ackupHelpers.cpp
|
| e583a4ea8c90105eee9b408d39bca3a4af6a2569 |
06-Jun-2009 |
Mathias Agopian <mathias@google.com> |
get rid of LogSocket which wasn't even implemented (enabled)
ndroid.mk
ogSocket.cpp
|
| 55e3d60da5626752ffe1d15150d35ccb8fa644e7 |
05-Jun-2009 |
Mathias Agopian <mathias@google.com> |
break dependency on utils/ZipEntry.h and utils/ZipFile.h, get rid of inet_address.h and Socket.h which were not used
ndroid.mk
netAddress.cpp
ocket.cpp
ipEntry.cpp
ipFile.cpp
|
| 79525264e5a594f9d99ef7ca0b6ac8e8f47a6ac6 |
05-Jun-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change 3284
* changes:
rename string_array.h to StringArray.h and move the implementation from the header file to a new cpp file.
|
| 8ed6beb515460001a0f5ee91b874289fbb053768 |
05-Jun-2009 |
Mathias Agopian <mathias@google.com> |
rename string_array.h to StringArray.h and move the implementation from the header file to a new cpp file.
StringArray is used in two places in framework/base and in the Sim. Ideally we should get rid of it and use Vector<String8> instead of creating new code.
ndroid.mk
tringArray.cpp
|
| 3f0c72ab4b3b950ecb29995c07b7af4f71582a7a |
05-Jun-2009 |
Christopher Tate <ctate@google.com> |
am 0032ce80: Fix back_up_files() error detection when opening/CRCing the file
Merge commit '0032ce80ac127e6bfb25d727162eee4af208dc77'
* commit '0032ce80ac127e6bfb25d727162eee4af208dc77':
Fix back_up_files() error detection when opening/CRCing the file
|
| 1b6aee15157f0236ac1fc7885735609bf27171d3 |
05-Jun-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
am 2a318867: Merge change 3203 into donut
Merge commit '2a3188672ab2b65c0ce7c9c598a463e382c47696'
* commit '2a3188672ab2b65c0ce7c9c598a463e382c47696':
rename a few files to camel-case, add copyright notices
|
| 0032ce80ac127e6bfb25d727162eee4af208dc77 |
05-Jun-2009 |
Christopher Tate <ctate@google.com> |
Fix back_up_files() error detection when opening/CRCing the file
ackupHelpers.cpp
|
| 8ae2335a3c93d0c00e998fdec18f64dfe43b94cb |
04-Jun-2009 |
Mathias Agopian <mathias@google.com> |
rename a few files to camel-case, add copyright notices
ndroid.mk
ackupData.cpp
ackupHelpers.cpp
haracterData.h
nicode.cpp
ipEntry.cpp
ipFile.cpp
ipFileCRO.cpp
ipFileRO.cpp
ipUtils.cpp
ackup_data.cpp
ackup_helper_file.cpp
haracterData.h
|
| 696959c7b6c5d8d1d1fbccdc5c1e9ae09363c064 |
01-Jun-2009 |
Mathias Agopian <mathias@google.com> |
get rid of TimerProbe which is never used
ndroid.mk
imerProbe.cpp
|
| 14f955b5d76233668f6bb0e9642daa8a59fa42cc |
01-Jun-2009 |
Mathias Agopian <mathias@google.com> |
get rid of sleepForInterval() which didn't seem to be used anywhere in the source tree. Also get rid of ported.h which seem to be used only (possibly) in the sim. moved the implementation there.
ndroid.mk
imers.cpp
orted.cpp
|
| 7fea935590ad5629a1c8fe004f57ce79cf1c7a5a |
28-May-2009 |
Andy McFadden <fadden@android.com> |
Sim-only files move, part 2/2.
Move Pipe and executablepath from libutils to the simulator, since nothing
else uses them.
ndroid.mk
ipe.cpp
xecutablepath_darwin.cpp
xecutablepath_linux.cpp
|
| aaf834a284a025cedd8ec1cf01d09e1790c1dcf8 |
23-May-2009 |
Mathias Agopian <mathias@google.com> |
some work to try to reduce the code size of some native libraries
- make sure that all binder Bn classes define a ctor and dtor in their respective library.
This avoids duplication of the ctor/dtor in libraries where these objects are instantiated.
This is also cleaner, should we want these ctor/dtor to do something one day.
- same change as above for some Bp classes and various other non-binder classes
- moved the definition of CHECK_INTERFACE() in IInterface.h instead of having it everywhere.
- improved the CHECK_INTERFACE() macro so it calls a single method in Parcel, instead of inlining its code everywhere
- IBinder::getInterfaceDescriptor() now returns a "const String16&" instead of String16, which saves calls to String16 and ~String16
- implemented a cache for BpBinder::getInterfaceDescriptor(), since this does an IPC. HOWEVER, this method never seems to be called.
The cache makes BpBinder bigger, so we need to figure out if we need this method at all.
allStack.cpp
extOutput.cpp
|
| 6a3a2b9d20212d8496744ebdc47a52bd6c670cbb |
23-May-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
am 04561a55: Merge change 2359 into donut
Merge commit '04561a55df693e7bd8d3047ccc4fbef504ac07cf'
* commit '04561a55df693e7bd8d3047ccc4fbef504ac07cf':
Fix for the simultor build breakage.
|
| 04561a55df693e7bd8d3047ccc4fbef504ac07cf |
23-May-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change 2359 into donut
* changes:
Fix for the simultor build breakage.
|
| f4c46b94b867f6a01bf7d0be18f667819338072f |
22-May-2009 |
Nicolas Catania <niko@google.com> |
Fix for the simultor build breakage.
Added missing include sys/time.h for utimes.
Detects when stat64 uses a timespec for the modif and access times
and work around the missing st_*time_nsec.
Apologies for the whitespace changes, emacs removed them automatically.
ackup_helper_file.cpp
|
| d50a458bb291801ab9fdc119301bc7b84b42a6e3 |
22-May-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change 2351 into donut
* changes:
Fix a major bug in Bundle when unparcelling from AIDL.
|
| 6aff905048ba3b03724f17e2aba9089872e14cd2 |
22-May-2009 |
Dianne Hackborn <hackbod@google.com> |
Fix a major bug in Bundle when unparcelling from AIDL.
There was a serious problem in the Bundle(Parcel) and readFromParcel() methods,
where it wasn't doing the copying of the Parcel that Parcel.readBundle() does
and is a basic requirement for it to work correctly.
This re-arranges the code to make all of these functions (hopefully) correct.
Also fix a problem in Parcel where we were not duping fds when copying data from
one Parcel to another.
arcel.cpp
|
| fc5095f44ba46b57f4ef6179ee4d69ce3a7fe69a |
22-May-2009 |
Marco Nelissen <marcone@google.com> |
am 7198030f: This should fix the simulator build.
Merge commit '7198030fce4b54820a65a10d54fae18a1ab5df84'
* commit '7198030fce4b54820a65a10d54fae18a1ab5df84':
This should fix the simulator build.
|
| 7198030fce4b54820a65a10d54fae18a1ab5df84 |
22-May-2009 |
Marco Nelissen <marcone@google.com> |
This should fix the simulator build.
utex_synchro.c
|
| 9890815e427c49192efd738a8ae07ce038da92be |
20-May-2009 |
Mathias Agopian <mathias@google.com> |
bring the native_handle stuff back from master_gl
arcel.cpp
|
| 25ba5b6564224dceefa086b5c439ef28dad530ca |
19-May-2009 |
Mathias Agopian <mathias@google.com> |
checkpoint: split libutils into libutils + libbinder
ndroid.mk
inder.cpp
pBinder.cpp
DataConnection.cpp
Interface.cpp
Memory.cpp
PCThreadState.cpp
PermissionController.cpp
ServiceManager.cpp
emoryBase.cpp
emoryDealer.cpp
emoryHeapBase.cpp
emoryHeapPmem.cpp
arcel.cpp
rocessState.cpp
tatic.cpp
|
| bad962bf407bbb7a7ce296fb75f1883375afa832 |
20-May-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
am e2914615: Merge change 2099 into donut
Merge commit 'e29146158b6048936671decc060d398a68333fc0'
* commit 'e29146158b6048936671decc060d398a68333fc0':
Hook up the backup data writer, and add a utility to read the backup data files.
|
| d2110dbce071a236b6176de344ca797b737542eb |
19-May-2009 |
Joe Onorato <joeo@android.com> |
Hook up the backup data writer, and add a utility to read the backup data files.
ackup_data.cpp
ackup_helper_file.cpp
|
| f1f12f8cfcc99bb9a50ae5b555b5ce050726a1fa |
19-May-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
am 656a2726: Merge change 1910 into donut
Merge commit '656a2726ad977be194c3b8f4bf4ec3068bf3e1c9'
* commit '656a2726ad977be194c3b8f4bf4ec3068bf3e1c9':
Update aapt badging for native code, configs, density, etc.
|
| bb9ea30ea9e390e69602935571795d2c80dc7b91 |
19-May-2009 |
Dianne Hackborn <hackbod@google.com> |
Update aapt badging for native code, configs, density, etc.
ssetManager.cpp
|
| 28a6f667c2c668f5b388a54bcfafc27d2d9cb299 |
16-May-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
am e85bb9eb: Merge change 1823 into donut
Merge commit 'e85bb9ebcce85b8c7a0e0ccb5116cd25bf684727'
* commit 'e85bb9ebcce85b8c7a0e0ccb5116cd25bf684727':
Add the backup data file writer C++ class.
|
| 2e1da32203b7f6df76023f25a7382a31fad6b19d |
16-May-2009 |
Joe Onorato <joeo@android.com> |
Add the backup data file writer C++ class.
ackup_data.cpp
ackup_helper_file.cpp
|
| 55051ebdd1ebf043f9d0e3dcf025c8c8930cf567 |
15-May-2009 |
Joe Onorato <joeo@android.com> |
am 4535e405: Implement the C++ class to write the backed up file data.
Merge commit '4535e40544aeb957d44fad75fbe5676effe03689'
* commit '4535e40544aeb957d44fad75fbe5676effe03689':
Implement the C++ class to write the backed up file data.
|
| 4535e40544aeb957d44fad75fbe5676effe03689 |
15-May-2009 |
Joe Onorato <joeo@android.com> |
Implement the C++ class to write the backed up file data.
ndroid.mk
ackup_data.cpp
ackup_helper_file.cpp
ile_backup_helper.cpp
|
| a64b860749ad7e5f9e887013d87b56b928c5d405 |
14-May-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
am aa642c0c: Merge changes 1591,1596 into donut
Merge commit 'aa642c0cc20293137376d44f8221876c121e5be9'
* commit 'aa642c0cc20293137376d44f8221876c121e5be9':
Get the backup calling through to the file backup helper.
Fix typos.
Add a new feature to android.os.Debug to add the ability to inject only specific fields when calling setFieldsOn().
Fixes #1836075. Adds consistency checks for the View hierarchy. To enable them, you need a debug build and ViewDebug.sConsistencyCheckEnabled set to true in debug.prop. This change also lets you easily enable drawing and layout profiling in ViewRoot by setting ViewRoot.sProfileDrawing, ViewRoot.sProfileLayout and ViewRoot.sShowFps in debug.prop with a debug build.
Add Intent.ACTION_APP_ERROR
|
| 290bb011c5c1a9ba1f2116810b06cf52a9c36b3e |
14-May-2009 |
Joe Onorato <joeo@android.com> |
Get the backup calling through to the file backup helper.
This includes some cleanup to make the parameters match
between BackupService.onBackup and FileBackupHelper.performBackup.
ile_backup_helper.cpp
|
| c825d3ebd6ca66e65e63fdc76f032e08aa2a8e22 |
06-May-2009 |
Joe Onorato <joeo@android.com> |
fix the sim build. disables the tests for now.
ile_backup_helper.cpp
|
| 7fca56513587bbf899d4d281a43d7eb0819da9af |
06-May-2009 |
Joe Onorato <joeo@android.com> |
fix the sim build. disables the tests for now.
ile_backup_helper.cpp
|
| b61381bc942a2cd60fcdced888ede76cd0711f00 |
06-May-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
am 4488b11: Merge change 1039 into donut
Merge commit '4488b11c51ad8f5b8330279a9405e5a0f8586aa4'
* commit '4488b11c51ad8f5b8330279a9405e5a0f8586aa4':
Add some C++ code to do raw files for backup
|
| 3ad977b41c6e4ef30c2f4f316b909b742ffc04aa |
05-May-2009 |
Joe Onorato <joeo@android.com> |
Add some C++ code to do raw files for backup
ndroid.mk
ile_backup_helper.cpp
|
| 5c685a948e9eed5f02c4e961d2d928e1f60e2e62 |
29-Apr-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
am 9c56513: Merge change 165 into donut
Merge commit '9c5651390056cd9c2f68d5df057739528bd4128b'
* commit '9c5651390056cd9c2f68d5df057739528bd4128b':
Squashed commit of the following:
|
| 96e20409afc720f61d0cd49bf1441f62069bd6bb |
22-Apr-2009 |
Robert Greenwalt <robdroid@android.com> |
Squashed commit of the following:
commit 012b56fc607cf243cf4b29cb2a5f172bcbe0aecd
Author: Robert Greenwalt <robdroid@android.com>
Date: Wed Apr 22 14:31:26 2009 -0700
Additional fixes and tests for density.
commit 91fdc8e187551ae69e0029a4325fb3ad38fe411b
Author: Robert Greenwalt <robdroid@android.com>
Date: Tue Apr 14 14:39:00 2009 -0700
Fix runtime resource selection logic.
Fix isBetterThan so that o or this may be supperior at any stage.
Used to only handle this-better or tie at each stage, biasing against o.
Also allows reset of unit test to succeed. Fixes bug 1709202.
esourceTypes.cpp
|
| e7c71d3a8cfb0c9c3637e0956fee3abc5a1fb094 |
20-Apr-2009 |
Marco Nelissen <> |
Merge branch 'readonly-p4-master'
|
| e38e90bf222515538281cc73c5e4a9f3c269c875 |
20-Apr-2009 |
Marco Nelissen <> |
AI 146964: tabs -> spaces
Automated import of CL 146964
ipFile.cpp
|
| 2a73de7b21a89aa2ba4c254d28658b49793425b2 |
18-Mar-2009 |
Jean-Baptiste Queru <jbq@google.com> |
Merge commit 'remotes/korg/cupcake' into merge
Conflicts:
core/java/android/view/animation/TranslateAnimation.java
core/jni/Android.mk
core/res/res/values-en-rGB/strings.xml
libs/audioflinger/AudioFlinger.cpp
libs/surfaceflinger/LayerScreenshot.cpp
packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
|
| c39a6e0c51e182338deb8b63d07933b585134929 |
11-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@137873
tring16.cpp
|
| 4df2423a947bcd3f024cc3d3a1a315a8dc428598 |
05-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@136594
allStack.cpp
esourceTypes.cpp
tring16.cpp
hreads.cpp
|
| 9066cfe9886ac131c34d59ed0e2d287b0e3c0087 |
04-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@135843
ndroid.mk
sset.cpp
ssetDir.cpp
ssetManager.cpp
inder.cpp
pBinder.cpp
ufferedTextOutput.cpp
allStack.cpp
ebug.cpp
ileMap.cpp
DataConnection.cpp
Interface.cpp
Memory.cpp
PCThreadState.cpp
PermissionController.cpp
ServiceManager.cpp
netAddress.cpp
ogSocket.cpp
ODULE_LICENSE_APACHE2
emoryBase.cpp
emoryDealer.cpp
emoryHeapBase.cpp
emoryHeapPmem.cpp
OTICE
arcel.cpp
ipe.cpp
rocessState.cpp
EADME
efBase.cpp
esourceTypes.cpp
haredBuffer.cpp
ocket.cpp
tatic.cpp
topWatch.cpp
tring16.cpp
tring8.cpp
ystemClock.cpp
extOutput.cpp
hreads.cpp
imerProbe.cpp
imers.cpp
nicode.cpp
ectorImpl.cpp
ipEntry.cpp
ipFile.cpp
ipFileCRO.cpp
ipFileRO.cpp
ipUtils.cpp
haracterData.h
xecutablepath_darwin.cpp
xecutablepath_linux.cpp
utex_synchro.c
isc.cpp
orted.cpp
|
| d83a98f4ce9cfa908f5c54bbd70f03eec07e7553 |
04-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@135843
ndroid.mk
sset.cpp
ssetDir.cpp
ssetManager.cpp
inder.cpp
pBinder.cpp
ufferedTextOutput.cpp
allStack.cpp
ebug.cpp
ileMap.cpp
DataConnection.cpp
Interface.cpp
Memory.cpp
PCThreadState.cpp
PermissionController.cpp
ServiceManager.cpp
netAddress.cpp
ogSocket.cpp
ODULE_LICENSE_APACHE2
emoryBase.cpp
emoryDealer.cpp
emoryHeapBase.cpp
emoryHeapPmem.cpp
OTICE
arcel.cpp
ipe.cpp
rocessState.cpp
EADME
efBase.cpp
esourceTypes.cpp
haredBuffer.cpp
ocket.cpp
tatic.cpp
topWatch.cpp
tring16.cpp
tring8.cpp
ystemClock.cpp
extOutput.cpp
hreads.cpp
imerProbe.cpp
imers.cpp
nicode.cpp
ectorImpl.cpp
ipEntry.cpp
ipFile.cpp
ipFileCRO.cpp
ipFileRO.cpp
ipUtils.cpp
haracterData.h
xecutablepath_darwin.cpp
xecutablepath_linux.cpp
utex_synchro.c
isc.cpp
orted.cpp
|
| 076357b8567458d4b6dfdcf839ef751634cd2bfb |
03-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@132589
hreads.cpp
|
| 3dec7d563a2f3e1eb967ce2054a00b6620e3558c |
03-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@137055
hreads.cpp
|
| bc4afde167513f7efe76012015f9fa3641c156cf |
14-Feb-2009 |
Rebecca Schultz Zavin <rebecca@android.com> |
Need to dup file descriptor when reading from the binder for native handles
When reading a native handle that has passed through the binder,
the fds have to be duped to prevent them from getting closed when the binder
object is destructed.
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
arcel.cpp
|
| d24b8183b93e781080b2c16c487e60d51c12da31 |
11-Feb-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@130745
arcel.cpp
esourceTypes.cpp
tring8.cpp
|
| 22f7dfd23490a3de2f21ff96949ba47003aac8f8 |
20-Jan-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@127101
arcel.cpp
|
| b798689749c64baba81f02e10cf2157c747d6b46 |
10-Jan-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@125939
emoryHeapBase.cpp
|
| f013e1afd1e68af5e3b868c26a653bbfb39538f8 |
18-Dec-2008 |
The Android Open Source Project <initial-contribution@android.com> |
Code drop from //branches/cupcake/...@124589
ndroid.mk
allStack.cpp
PCThreadState.cpp
ogSocket.cpp
emoryDealer.cpp
emoryHeapPmem.cpp
esourceTypes.cpp
utex_synchro.c
|
| 54b6cfa9a9e5b861a9930af873580d6dc20f773c |
21-Oct-2008 |
The Android Open Source Project <initial-contribution@android.com> |
Initial Contribution
ndroid.mk
sset.cpp
ssetDir.cpp
ssetManager.cpp
inder.cpp
pBinder.cpp
ufferedTextOutput.cpp
allStack.cpp
ebug.cpp
ileMap.cpp
DataConnection.cpp
Interface.cpp
Memory.cpp
PCThreadState.cpp
PermissionController.cpp
ServiceManager.cpp
netAddress.cpp
ogSocket.cpp
ODULE_LICENSE_APACHE2
emoryBase.cpp
emoryDealer.cpp
emoryHeapBase.cpp
emoryHeapPmem.cpp
OTICE
arcel.cpp
ipe.cpp
rocessState.cpp
EADME
efBase.cpp
esourceTypes.cpp
haredBuffer.cpp
ocket.cpp
tatic.cpp
topWatch.cpp
tring16.cpp
tring8.cpp
ystemClock.cpp
extOutput.cpp
hreads.cpp
imerProbe.cpp
imers.cpp
nicode.cpp
ectorImpl.cpp
ipEntry.cpp
ipFile.cpp
ipFileCRO.cpp
ipFileRO.cpp
ipUtils.cpp
haracterData.h
xecutablepath_darwin.cpp
xecutablepath_linux.cpp
utex_synchro.c
isc.cpp
orted.cpp
|