48402 Commits

Author SHA1 Message Date
James Dong
c36b3c6956 Fix missing cross-ref links in the MediaPlayer.java javadoc
Change-Id: Ie5fba234d226ff792661ec346ddf87f43b5a0dc7
2011-03-29 12:16:59 -07:00
Eric Fischer
f5cedbe508 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-29 12:16:53 -07:00
David Li
87a8f316a6 Merge "GLES2Dbg: use 256KB chunks for lzf compression" 2011-03-29 12:00:07 -07:00
Eric Fischer
627e59ad08 Import revised translations. DO NOT MERGE
Change-Id: I962bb9917aa3f3d4b911c1ad7fdfbcda94afa0c7
2011-03-29 11:58:23 -07:00
Andreas Huber
21e73bf25a Make sure we don't trigger a log warning if calling ALooper::stop() from the looper thread.
Change-Id: I669d589ab4521fe44a3e8f638c7ce8e79174d625
related-to-bug: 4179898
2011-03-29 11:50:24 -07:00
Amith Yamasani
e590ccfb12 Fix the javadoc for LocationManager.requestSingleUpdate()
It was saying the same thing as requestLocationUpdates(), but it only provides a single update.

Change-Id: I0a0f612104a946b7db96928505bb95673377a335
2011-03-29 11:26:08 -07:00
Brian Carlstrom
ed7e00729f SamplingProfilerIntegration and SamplingProfiler improvements (3/3)
Summary:

frameworks/base
- fix profiling to collect data beyond the first snapshot
- avoid many small files, accumulate data over process lifetime

libcore:
- add support for VM specific sampling, trying to cut down overhead
- added support for converting snapshot files to text format
- fixed race in profiler when stopping

dalvik
- added VMStack.setThreadStackTrace interface for filling a stack
  trace into an existing StackTraceElement[]

Details:

frameworks/base

    Changed snapshots from text to binary hprof format (bumping version to 3)
    Changed from one file per snapshot to one file per process lifetime.
    Restart profiling after snapshot.

	core/java/com/android/internal/os/SamplingProfilerIntegration.java

    Add quick test in maybeSnapshot to avoid doing work when the
    SamplingProfilerIntegration is disabled. Make maybeSnapshot
    private. Remove unneeded memory allocation in handleLowMemory.

	core/java/android/app/ActivityThread.java

libcore

    Added ThreadSampler interface. This allows VM specific thread
    sampling optimizations. The portable version continues to use
    Thread.getStackTrace().

	dalvik/src/main/java/dalvik/system/profiler/ThreadSampler.java
	dalvik/src/main/java/dalvik/system/profiler/PortableThreadSampler.java
	dalvik/src/main/java/dalvik/system/profiler/SamplingProfiler.java

    Add VMStack.setThreadStackTrace and use in new DalvikThreadSampler
    to avoid allocating a full stack trace when only a limited depth
    is desired.

	dalvik/src/main/java/dalvik/system/profiler/DalvikThreadSampler.java
	dalvik/src/main/java/dalvik/system/VMStack.java

    Refactored BinaryHprof.readMagic out of BinaryHprofReader so it
    can be used by HprofBinaryToAscii converter to probing file
    types. Added magic number constant to be shared between readMagic
    and BinaryHprofWriter.

	dalvik/src/main/java/dalvik/system/profiler/BinaryHprof.java
	dalvik/src/main/java/dalvik/system/profiler/BinaryHprofReader.java
	dalvik/src/main/java/dalvik/system/profiler/BinaryHprofWriter.java
	dalvik/src/main/java/dalvik/system/profiler/HprofBinaryToAscii.java

    Removed unneeded HprofWriter interface. Changed to simpler static
    interface to write HprofData to binary and text formats.

	dalvik/src/main/java/dalvik/system/profiler/HprofWriter.java
	dalvik/src/main/java/dalvik/system/profiler/AsciiHprofWriter.java
	dalvik/src/main/java/dalvik/system/profiler/BinaryHprofWriter.java
	dalvik/src/test/java/dalvik/system/profiler/SamplingProfilerTest.java

    Added support for reading snapshot files created by
    SamplingProfilerIntegration by stripping the text header to allow
    easier conversion to the text format.

	dalvik/src/main/java/dalvik/system/profiler/HprofBinaryToAscii.java

    Fixed race between Sampler and
    SamplingProfiler.stop. SamplingProfiler.stop previously simply
    called the Sampler's TimerTask.cancel method, but this does not
    wait for a currently running Sampler to finish. The TimerTask
    documentation says the only reliable way to do this is to have the
    run() cancel itself, so that is what is now done, with new code to
    ensure that SamplingProfiler.stop does not return until the
    Sampler has been terminated.

	dalvik/src/main/java/dalvik/system/profiler/SamplingProfiler.java

dalvik

   Refactored VMStack_getThreadStackTrace to create helper getTraceBuf
   used to implement new VMStack_setThreadStackTrace. The new version
   interface fills an existing StackTraceElement[], avoid allocating
   unnecessary StackTraceElements.

	vm/native/dalvik_system_VMStack.c

   Refactor dvmGetStackTraceRaw to create dvmSetStackTraceRaw which
   fills in an existing, potentially smaller, StackTraceElement[].

	vm/Exception.c
	vm/Exception.h

   Change stack depths to be unsigned to avoid signed/unsigned comparison warnings.

	vm/Ddm.c
	vm/Exception.c
	vm/Exception.h

Change-Id: I4b90255e4e1d33ea2b569321c4968b0f3369f251
2011-03-29 11:24:37 -07:00
Amith Yamasani
8d9f995334 Merge "Fix the javadoc for LocationManager.requestSingleUpdate()" 2011-03-29 10:46:59 -07:00
Andreas Huber
b13c4a9b6c Surfaceflinger expects rectangles to be specified right/bottom edge exclusive.
Change-Id: Ib493572c614dbb74fa23b13c3e43899e3b31cf0e
related-to-bug: 4147205
2011-03-29 10:00:20 -07:00
Brad Fitzpatrick
f7a9b86919 am 1e7fb7ae: Merge "Error in compound cache-control header."
* commit '1e7fb7aed7b00cebc8f0e501c911727af6527523':
  Error in compound cache-control header.
2011-03-29 09:27:16 -07:00
Brad Fitzpatrick
1e7fb7aed7 Merge "Error in compound cache-control header." 2011-03-29 08:55:02 -07:00
Brad Fitzpatrick
397de169e5 am fae5e289: am 6f67e7bf: am 2e383bc6: Merge "Making it possible to call SIP calls with special allowed chars."
* commit 'fae5e2894ff3c09f27efac2a7ee6b9cfd4ed14b0':
  Making it possible to call SIP calls with special allowed chars.
2011-03-29 08:53:48 -07:00
Brad Fitzpatrick
37c1bbb51a am 8ef609ab: am a4206029: am 5d5a0ca5: Merge "Fixing the wrong link in YuvImage JavaDoc."
* commit '8ef609abe56c9872c93fc304037d1e52d4475e5e':
  Fixing the wrong link in YuvImage JavaDoc.
2011-03-29 08:53:38 -07:00
Brad Fitzpatrick
fae5e2894f am 6f67e7bf: am 2e383bc6: Merge "Making it possible to call SIP calls with special allowed chars."
* commit '6f67e7bf831147257e078dd72a22f2e43e009122':
  Making it possible to call SIP calls with special allowed chars.
2011-03-29 08:45:30 -07:00
Brad Fitzpatrick
8ef609abe5 am a4206029: am 5d5a0ca5: Merge "Fixing the wrong link in YuvImage JavaDoc."
* commit 'a4206029cbb8f6c02c47db52f84b7d52e154e35a':
  Fixing the wrong link in YuvImage JavaDoc.
2011-03-29 08:45:20 -07:00
Bill Gruber
d7662aea65 am 67a249d6: am 0b0dbea0: am e4f33617: am faede250: IAB doc update for final launch
* commit '67a249d607e029650104ca71373b09b852614725':
  IAB doc update for final launch
2011-03-29 00:12:49 -07:00
Bill Gruber
67a249d607 am 0b0dbea0: am e4f33617: am faede250: IAB doc update for final launch
* commit '0b0dbea0bc38087dfa3e82b91c0381154bb8bdfd':
  IAB doc update for final launch
2011-03-29 00:06:18 -07:00
Bill Gruber
0b0dbea0bc am e4f33617: am faede250: IAB doc update for final launch
* commit 'e4f33617c3654bdcb246ee8f74e67d1828cd42c9':
  IAB doc update for final launch
2011-03-29 00:00:37 -07:00
Henrik Baard
eb0ced7a09 Error in compound cache-control header.
A cache control header containing both no-cache and max-age attribute does not
behave as expected.

Cache-Control: no-cache, max-age=200000

Will set expired to 20000ms seconds, ignoring the no-cache header. My
interpretation is that the no-cache header should not be ignored in
this case.

Change-Id: Iadd1900e4d2c6c0dacc6bb3e7b944cf78ca9b266
2011-03-29 08:54:09 +02:00
Bill Gruber
e4f33617c3 am faede250: IAB doc update for final launch
* commit 'faede250301e291a060d094c73a25a351f96cbb5':
  IAB doc update for final launch
2011-03-28 23:48:34 -07:00
Mike Lockwood
35167d95e1 Remove logging from HardwareService flashlight calls
Bug: 4184090

Change-Id: I772b9098e082afcde09ae607d196c1591137fa6d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-28 20:29:14 -07:00
Jeff Sharkey
67bcd82b40 Merge "Support Ctrl-based EditText movement." 2011-03-28 19:57:10 -07:00
Bill Gruber
faede25030 IAB doc update for final launch
Change-Id: I5173422eb65f4effc61162c2b172750dee0a6a2c
2011-03-28 19:50:20 -07:00
Matthew Xie
571a24bfe3 Merge "Use mask_eighth_bit function to replace is_ascii check." 2011-03-28 18:13:59 -07:00
Jack Palevich
d6f4caca5d Merge "Add Java support for a few accidentally omitted OpenGL ES APIs." 2011-03-28 17:08:50 -07:00
Iliyan Malchev
d2b1f29aa0 Merge "frameworks/base: some camera-interface cleanup" 2011-03-28 17:07:02 -07:00
Amith Yamasani
e23fc8ee13 Fix the javadoc for LocationManager.requestSingleUpdate()
It was saying the same thing as requestLocationUpdates(), but it only provides a single update.

Change-Id: Ib677d40e050a82332df539a823cc677de1fcb4fd
2011-03-28 16:52:44 -07:00
Iliyan Malchev
40c364136f frameworks/base: some camera-interface cleanup
Methods getNumberOfVideoBuffers() and getVideoBuffer() as well as struct
image_rect_struct are no longer used (instead, the necessary information is
passed through ANativeWindow.)

Change-Id: If4b11446fc9ccbde1f6b45bc70c0d0b8e54376eb
Signed-off-by: Iliyan Malchev <malchev@google.com>
2011-03-28 16:28:57 -07:00
Eino-Ville Talvala
ff93b858c3 Add a simple OpenGL ES 2.0 test program that displays a camera preview stream.
Uses a SurfaceTexture feeding into a OpenGL ES2 GLSurfaceView. Also
uses accelerometer data and SurfaceTexture-provided timestamps for a
simple physics simulation which moves the camera preview oval in
response to device movement.

Change-Id: I275a0c6a4e25829d617e635b25e70e2a9c8455cb
2011-03-28 15:27:19 -07:00
Jack Palevich
73108675c9 Add Java support for a few accidentally omitted OpenGL ES APIs.
Fixes 3491494 Support OpenGL APIs: glBlendEquationSeparate and friends

Change-Id: I8fdc94b6ea14e9a7e3d402a965d500790a3d8f77
2011-03-28 14:49:12 -07:00
Andreas Huber
3a28b022bc Ignore OMX codec messages once we're in ERROR state.
Change-Id: I2bdf58ed705a641be1f3aec89fa41cada6acfc96
related-to-bug: 4175573
2011-03-28 14:48:28 -07:00
Wink Saville
45538666db am 94a19db5: am 59d1b26a: Merge "DataConnectionTracker cleanup when disposed." into honeycomb-LTE
* commit '94a19db5a78d3f43b01fa10bd09788f68debbcab':
  DataConnectionTracker cleanup when disposed.
2011-03-28 12:15:28 -07:00
Wink Saville
94a19db5a7 am 59d1b26a: Merge "DataConnectionTracker cleanup when disposed." into honeycomb-LTE
* commit '59d1b26a6a4b9b2de829d62af2179f57deb79391':
  DataConnectionTracker cleanup when disposed.
2011-03-28 12:13:22 -07:00
Wink Saville
59d1b26a6a Merge "DataConnectionTracker cleanup when disposed." into honeycomb-LTE 2011-03-28 12:11:42 -07:00
Mike Lockwood
60355780ea am 038c7297: am b115807a: am 7661dd8d: Merge "UsbService: Fix JNI local reference leaks in the USB host support code" into honeycomb-mr1
* commit '038c7297c9e2e4b6cdb490ac9fe7102da434278a':
  UsbService: Fix JNI local reference leaks in the USB host support code
2011-03-28 11:04:29 -07:00
Mike Lockwood
038c7297c9 am b115807a: am 7661dd8d: Merge "UsbService: Fix JNI local reference leaks in the USB host support code" into honeycomb-mr1
* commit 'b115807aaf0fc6326903302be9bd9ff3877fa968':
  UsbService: Fix JNI local reference leaks in the USB host support code
2011-03-28 11:02:58 -07:00
Mike Lockwood
b115807aaf am 7661dd8d: Merge "UsbService: Fix JNI local reference leaks in the USB host support code" into honeycomb-mr1
* commit '7661dd8de10d2400cedc421358c4261556b2b5c8':
  UsbService: Fix JNI local reference leaks in the USB host support code
2011-03-28 11:00:33 -07:00
Ramesh Sudini
3bbe33d703 DataConnectionTracker cleanup when disposed.
Change-Id: I4db442ae110531f33280ceb626fc260d392a1bd5
2011-03-28 11:00:26 -07:00
Mike Lockwood
7661dd8de1 Merge "UsbService: Fix JNI local reference leaks in the USB host support code" into honeycomb-mr1 2011-03-28 10:58:03 -07:00
David Li
cbe4e5e5ab GLES2Dbg: use 256KB chunks for lzf compression
Data format is uint32_t totalDecompressedSize, then repeat:
uint32_t chunkDecompressedSize, chunkCompressedSize, chunk data.
If chunkCompressedSize == 0, then chunk is not compressed.

Also start fixing integer sizes on server.
On client, set endianness to match server.

Change-Id: I0d5afa16976ea6019b91c4e21d284605da7e135e
Signed-off-by: David Li <davidxli@google.com>
2011-03-28 10:32:37 -07:00
Andreas Huber
ab13a89c99 am a4a81aef: am e7cedad2: am 2edbdcc6: Merge "After a seek there\'s a brief period where audio time isn\'t reestablished." into honeycomb-mr1
* commit 'a4a81aef39b15649bda146476d98f23ac554887f':
  After a seek there's a brief period where audio time isn't reestablished.
2011-03-28 08:34:06 -07:00
Andreas Huber
a4a81aef39 am e7cedad2: am 2edbdcc6: Merge "After a seek there\'s a brief period where audio time isn\'t reestablished." into honeycomb-mr1
* commit 'e7cedad2b8408a13c610f3a7fcf13597a432a37d':
  After a seek there's a brief period where audio time isn't reestablished.
2011-03-28 08:26:21 -07:00
Brad Fitzpatrick
b618b2ef87 am f0dbf00d: Merge "Handle OutOfMemoryError when decoding images in ThumbnailUtils"
* commit 'f0dbf00d37c349e8c615045876d6bc89b6bb8c54':
  Handle OutOfMemoryError when decoding images in ThumbnailUtils
2011-03-28 08:26:02 -07:00
Andreas Huber
e7cedad2b8 am 2edbdcc6: Merge "After a seek there\'s a brief period where audio time isn\'t reestablished." into honeycomb-mr1
* commit '2edbdcc6f2572e5f84253617b1850908344b3f8c':
  After a seek there's a brief period where audio time isn't reestablished.
2011-03-28 08:16:52 -07:00
Brad Fitzpatrick
7a84a60d56 am 1a5a2379: Merge "Unregister callback from binder when vibration is removed"
* commit '1a5a2379eb3a6cf16fb153aecbc4ac9e85d3ed42':
  Unregister callback from binder when vibration is removed
2011-03-28 08:15:35 -07:00
Brad Fitzpatrick
f0dbf00d37 Merge "Handle OutOfMemoryError when decoding images in ThumbnailUtils" 2011-03-28 08:13:08 -07:00
Andreas Huber
2edbdcc6f2 Merge "After a seek there's a brief period where audio time isn't reestablished." into honeycomb-mr1 2011-03-28 08:11:26 -07:00
Brad Fitzpatrick
1a5a2379eb Merge "Unregister callback from binder when vibration is removed" 2011-03-28 07:59:08 -07:00
Christer Fletcher
375fb9bfd2 Handle OutOfMemoryError when decoding images in ThumbnailUtils
Added handling of OutOfMemoryError handling to createImageThumbnail
method in ThumbnailUtils.java. During mediascanner run it would run
out of memory when trying to decode very large images. Now it handles
this error and returns null which is handled by the media scanner.

Change-Id: Ie68722dfa1cedd3c0847bf483baa40c4827ad5a8
2011-03-28 14:47:55 +02:00
Mike Lockwood
8f8c6023f2 UsbService: Fix JNI local reference leaks in the USB host support code
Bug: 4175857

Change-Id: I8b385f2257e509b0fb4d5f9516e9813b8165352d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-03-27 19:35:43 -07:00