Merge commit '4b20aab7997b5180a3b118fde204e55652b7dcb6'
* commit '4b20aab7997b5180a3b118fde204e55652b7dcb6':
Move some classes that have non ready APIs to internal packages
Merge commit '0910170f4acd2a219a455e5b9f74c7b6f3a81712'
* commit '0910170f4acd2a219a455e5b9f74c7b6f3a81712':
AI 148799: New TOC for PDK -- should be less cluttered and uses folding to better
Merge commit 'c331aeb8d65805a3a1129ecdea62567b6c7bb24b' into donut
* commit 'c331aeb8d65805a3a1129ecdea62567b6c7bb24b':
AI 148799: New TOC for PDK -- should be less cluttered and uses folding to better
Merge commit '2f655fb365ae518683c4b91647dc5bdaeb69ecbc'
* commit '2f655fb365ae518683c4b91647dc5bdaeb69ecbc':
AI 148797: Back-port the new version of the Grid.java from Donut.
Merge commit '24a8fe82dffacdfe2fab9d007b2a6538b5f511bc' into donut
* commit '24a8fe82dffacdfe2fab9d007b2a6538b5f511bc':
AI 148797: Back-port the new version of the Grid.java from Donut.
This new version uses "direct" java.nio.Buffer objects, which avoids a potential
crash that may occur when "indirect" java.nio.Buffer objects are used.
BUG=1849855
Automated import of CL 148797
Merge commit '7591406c350ec3c80bb7c5bbbf3130ea30b566bf'
* commit '7591406c350ec3c80bb7c5bbbf3130ea30b566bf':
AI 148792: 3 new pages: customization, early_suspend, and wakelock.
Merge commit '0355976f628857b2675377fa4f2de12b3b5a44aa' into donut
* commit '0355976f628857b2675377fa4f2de12b3b5a44aa':
AI 148793: Integrating publicly posted Bluetooth content.
Merge commit 'eb98133b0f66cca46ea2b8f54479fb745ddc478a' into donut
* commit 'eb98133b0f66cca46ea2b8f54479fb745ddc478a':
AI 148792: 3 new pages: customization, early_suspend, and wakelock.
This sample is not an application sample, but a framework sample.
It is moved to vendor/sample. A new "sample" vendor that will show how to create Android-based device
Merge commit 'e667fca809ad68c7466b1d769b16d858d489b21a'
* commit 'e667fca809ad68c7466b1d769b16d858d489b21a':
Fixed bugs in the media player api demo application
* changes:
Fixed bugs in the media player api demo application - release the MediaPlayer object when onPause - use onVideoSizeChanged listener to make sure that correct video size is known before starting playback
Merge commit 'bba5ffb847d10a65ce323f3c607f9f842c21e0c1'
* commit 'bba5ffb847d10a65ce323f3c607f9f842c21e0c1':
Add a new program for checking the correctness of the computed stack from a trace.
Merge commit '6b56383a3a9f086700436269e10602bb234cc25d'
* commit '6b56383a3a9f086700436269e10602bb234cc25d':
Fix the tracing code that keeps track of the Java method stack.
Add a "-d time" option to stack_dump to dump the stack at the given time.
The check_stack program checks that the generated stack that includes both
native functions and Java methods (generated from the emulator instruction
trace plus the method trace) is consistent with the stack of Java methods
that is computed from the method trace alone. (The method trace is
generated by the Dalvik interpreter).
This fixes a bug that was causing a "stack overflow" because it sometimes
wasn't popping off a Java method when it should have. I also changed the
showStack() method so that instead of always printing to stderr, you can
pass in a FILE* object to print to.
Merge commit '60b2fc90b7d7687189898f6064c62cf8b72a631e'
* commit '60b2fc90b7d7687189898f6064c62cf8b72a631e':
Update the NDK packaging script to generate zip archives for all platforms.
Merge commit 'ebcb72611b51969de9182070ca33d2b3dbfd674b'
* commit 'ebcb72611b51969de9182070ca33d2b3dbfd674b':
Remove hard-coded path to my home directory in build/tools/make-release.sh.
* changes:
Remove hard-coded path to my home directory in build/tools/make-release.sh. Now you need to use the --prebuilt-path=<path> option to specify where to pick up the prebuilt toolchain tarballs instead, for example:
Merge commit '37fa8d40fc0222cb5f2a741cacfa921a4cabae34'
* commit '37fa8d40fc0222cb5f2a741cacfa921a4cabae34':
Remove references to 'cupcake' in all of NDK (replace with 'android-1.5')
Merge commit 'a07dedea97a166b329872a0a0cb334857dc2d47e'
* commit 'a07dedea97a166b329872a0a0cb334857dc2d47e':
Add docs/LICENSES.TXT which indicates where to find the toolchain sources, as well as the GPL/LGPL text files.
Now you need to use the --prebuilt-path=<path> option to specify where to pick up
the prebuilt toolchain tarballs instead, for example:
build/tools/make-release.sh --prebuilt-path=/home/digit/android/ndk
Add also some other options to change the package prefix / release number / etc
Note: the prebuilt binary packages used by "make-release.sh" have
been updated to include the COPYING and COPYING.LIB files.
After this patch is commited, you should be able to run "make-release.sh"
to re-generate release packages that contain docs/LICENSES.TXT as well as COPYING and COPYING.LIB
