48543 Commits

Author SHA1 Message Date
Amith Yamasani
95cba338e9 am 342f38f9: am c1192096: am 7171f5b7: Merge "Fix the javadoc for LocationManager.requestSingleUpdate()" into honeycomb-mr1
* commit '342f38f9a95e26b20ebaaac6402409beb9ba96f8':
  Fix the javadoc for LocationManager.requestSingleUpdate()
2011-03-29 16:58:16 -07:00
Christopher Tate
fea9ab5421 Merge "Add view/drawable states for drag-accepting / drag-hovered" 2011-03-29 16:49:46 -07:00
Jeff Hamilton
0c691f0eb3 am ad91eee2: am 9c1ef098: Update the value for the NFC shared UID.
* commit 'ad91eee2774e18204a14d473242efe5640b91152':
  Update the value for the NFC shared UID.
2011-03-29 16:28:49 -07:00
Dmitry Shmidt
829f8e5ae5 Merge "bugreport: Add ping wlan gateway, dns1 and dns2 servers" 2011-03-29 16:28:00 -07:00
Scott Main
d3b62c961b docs: update makefile to show javadocs diffs for api level 12
Change-Id: I1ac584db778ec14b18129785126159f692459158
2011-03-29 16:25:16 -07:00
Dmitry Shmidt
9abfeb4123 bugreport: Add ping wlan gateway, dns1 and dns2 servers
Change-Id: I91c2b9be217fabe8f854c637c972377bc811cca8
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2011-03-29 16:21:12 -07:00
Jeff Brown
6e923274c5 Merge "Support chorded fallback keys." 2011-03-29 16:19:46 -07:00
Jeff Brown
da3d5a91b6 Support chorded fallback keys.
Also be more careful about canceling fallback keys during focus
transitions, when the application handles the key, or when the
policy decides to do something different.

Fixed a crash due to JNI CallObjectMethod returning an undefined
value (not null) when an exception is thrown.

Fixed a crash due to the policy trying to create a Dialog for
recent apps on the dispatcher thread.  It should happen on the
policy's Looper instead.

Bug: 4187302
Change-Id: I659a3fd1bd2325ed36d965f9beb75dacb89790c9
2011-03-29 16:16:55 -07:00
Christopher Tate
3d4bf17f49 Add view/drawable states for drag-accepting / drag-hovered
Added new drag_can_accept and drag_hovered XML attributes and the View
logic to support them.  Drawable states are now refreshed automatically
when a drag starts/ends and when a drag crosses the boundary of a
participating view.

Change-Id: I25f8ee02c83b3fa4f27201997d7eabf4be653fd8
2011-03-29 15:27:58 -07:00
The Android Open Source Project
5e1383f257 am ad663d80: Merge from gingerbread
* commit 'ad663d8040ddd4f3e537117847f20d42797b429e':
  egl: fixes for object refcounts
2011-03-29 15:23:08 -07:00
James Dong
5c8eff3308 Merge "Fix missing cross-ref links in the MediaPlayer.java javadoc" 2011-03-29 15:17:47 -07:00
Marco Nelissen
30ec6c2bf5 Merge "Fix media scanner uri handling." 2011-03-29 15:16:55 -07:00
Wink Saville
8a39562404 am fc151b6e: Merge "Cleanup DataConnectionTracker" into honeycomb-LTE
* commit 'fc151b6eb4a682510f3591879037b524bc8d59d0':
  Cleanup DataConnectionTracker
2011-03-29 15:12:22 -07:00
Teng-Hui Zhu
c0fccd1292 Add the loading progress UI when buffering
bug:4187252
Change-Id: I0f9f2c659303b391b1be896b9a30cc6bf7455da5
2011-03-29 15:07:35 -07:00
Wink Saville
fc151b6eb4 Merge "Cleanup DataConnectionTracker" into honeycomb-LTE 2011-03-29 14:44:56 -07:00
Eric Fischer
c9e5464b06 am b8c7c66d: am 0664a4b1: am b42e83b1: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit 'b8c7c66de23b9b20f3992722bb5e346d8e12dd0e':
  Import revised translations.  DO NOT MERGE
2011-03-29 14:19:51 -07:00
Eric Fischer
b8c7c66de2 am 0664a4b1: am b42e83b1: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '0664a4b18c3dcea82891a7389976a9d62ac7bc61':
  Import revised translations.  DO NOT MERGE
2011-03-29 14:15:22 -07:00
Amith Yamasani
342f38f9a9 am c1192096: am 7171f5b7: Merge "Fix the javadoc for LocationManager.requestSingleUpdate()" into honeycomb-mr1
* commit 'c1192096627f2f9da534cb8ab7b449d6ea82123f':
  Fix the javadoc for LocationManager.requestSingleUpdate()
2011-03-29 14:10:32 -07:00
Eric Fischer
0664a4b18c am b42e83b1: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit 'b42e83b1eccfd1fa1e02cd0c30edfc06e05de995':
  Import revised translations.  DO NOT MERGE
2011-03-29 14:07:14 -07:00
Amith Yamasani
c119209662 am 7171f5b7: Merge "Fix the javadoc for LocationManager.requestSingleUpdate()" into honeycomb-mr1
* commit '7171f5b7d16e9a0c861cc249188864385877077f':
  Fix the javadoc for LocationManager.requestSingleUpdate()
2011-03-29 14:06:29 -07:00
Amith Yamasani
7171f5b7d1 Merge "Fix the javadoc for LocationManager.requestSingleUpdate()" into honeycomb-mr1 2011-03-29 13:55:19 -07:00
The Android Open Source Project
ad663d8040 Merge from gingerbread
Change-Id: I31e3da083b642d5c7cf6332095fa228b840ee7bb
2011-03-29 13:54:43 -07:00
Andreas Huber
35eebbab59 Merge "Add a user-agent header to our RTSP requests." 2011-03-29 13:52:15 -07:00
Eric Fischer
b42e83b1ec Merge "Import revised translations. DO NOT MERGE" into honeycomb 2011-03-29 13:45:03 -07:00
Michael I. Gold
c3fba3be74 egl: fixes for object refcounts
eglMakeCurrent() would only deref the previous surfaces if the old and
new contexts were the same.  eglTerminate() should not touch TLS.
eglReleaseThread() needs to unbind the current context.

Change-Id: I7f4c090a287ee1e29e4708ae10679fb9d7d8c8c5
Related-Bug: 2964479
2011-03-29 13:43:54 -07:00
Andreas Huber
b0e7381ccb Add a user-agent header to our RTSP requests.
Change-Id: I02f8ff6a4a37fa59cc8c5fcfd3afb64ee11ba576
related-to-bug: 4173725
2011-03-29 13:34:28 -07:00
Eino-Ville Talvala
654cf011fa Merge "Add a simple OpenGL ES 2.0 test program that displays a camera preview stream." 2011-03-29 13:34:03 -07:00
Andreas Huber
8fddd761f9 Merge "Adding support for the '.mxmf' MIDI file extension." 2011-03-29 13:33:58 -07:00
Marco Nelissen
3e5e805594 Fix media scanner uri handling.
If a file was originally considered a video file (because it had
a .mp4 extension, for example), but was then discovered to have
only an audio track, it would update the type, but not the URI
for insertion into the media provider.

Change-Id: Ifdf3a177750f1e71ca5a058fa534d272e1505653
2011-03-29 13:29:42 -07:00
Eric Fischer
df491490a6 Import revised translations. DO NOT MERGE
Change-Id: I09aefa0ca2ba1ff78574c8fbad2242d7ef63689d
2011-03-29 13:26:46 -07:00
Bart Sears
1fb9f21676 am 7cad54cb: (-s ours) am 35137d66: (-s ours) am 6a19759c: Do Not Merge: Cherry-pick change I7667f9b8 to GingerBread
* commit '7cad54cb8283b67e5d4106112772dc038b7dbb40':
  Do Not Merge: Cherry-pick change I7667f9b8 to GingerBread
2011-03-29 13:23:55 -07:00
Huahui Wu
4083f5227b am 97621525: (-s ours) am 772f5bb1: (-s ours) am f440831d: DO NOT MERGE
* commit '97621525c54057550dc40b38dcbe03de70cadd87':
  DO NOT MERGE
2011-03-29 13:23:52 -07:00
Bart Sears
7cad54cb82 am 35137d66: (-s ours) am 6a19759c: Do Not Merge: Cherry-pick change I7667f9b8 to GingerBread
* commit '35137d669681a0d6a22316c035ea7c8edc8fdc33':
  Do Not Merge: Cherry-pick change I7667f9b8 to GingerBread
2011-03-29 13:19:07 -07:00
Huahui Wu
97621525c5 am 772f5bb1: (-s ours) am f440831d: DO NOT MERGE
* commit '772f5bb1894710b0f0068d4f34e85ce38becc4b6':
  DO NOT MERGE
2011-03-29 13:19:01 -07:00
Andreas Huber
eecadb9a84 Adding support for the '.mxmf' MIDI file extension.
Change-Id: Ic73e2f843f8640dd794d090413cf63232f0182b9
related-to-bug: 4186454
2011-03-29 13:17:30 -07:00
Eric Fischer
281eced2a5 am 7d5ae753: (-s ours) am bc2489e4: am f5cedbe5: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit '7d5ae7537858d6b01ae2ce12e34cb0a284138ccf':
  Import revised translations.  DO NOT MERGE
2011-03-29 12:30:12 -07:00
Eric Fischer
7d5ae75378 am bc2489e4: am f5cedbe5: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit 'bc2489e4c55ca7ae06afe1f3449135aa48359165':
  Import revised translations.  DO NOT MERGE
2011-03-29 12:27:29 -07:00
Andreas Huber
2fd376bd12 Merge "Make sure we don't trigger a log warning if calling ALooper::stop() from the looper thread." 2011-03-29 12:23:34 -07:00
Eric Fischer
bc2489e4c5 am f5cedbe5: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1
* commit 'f5cedbe508c46c27a6ce1554aed919bfbfc6fc4e':
  Import revised translations.  DO NOT MERGE
2011-03-29 12:20:42 -07:00
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