Merge commit '3424c02e6b931a8bbd651ae75217bebd008b2605' into gingerbread-plus-aosp
* commit '3424c02e6b931a8bbd651ae75217bebd008b2605':
Add software features for SIP and VOIP
Merge commit 'a800a2efa29d88e198220753f07e7d9ff69ddd9b' into gingerbread-plus-aosp
* commit 'a800a2efa29d88e198220753f07e7d9ff69ddd9b':
Adding a feature definition corresponding to support for Near-Field
Merge commit 'e34fe69e66d8c9bc76453347ba84261b060300f3' into gingerbread-plus-aosp
* commit 'e34fe69e66d8c9bc76453347ba84261b060300f3':
DO NOT MERGE Integrate edge effects into WebView.
The get/set for the pluginPath is leftover from the Gear's plugin
and is no longer useful now that plugins are loaded from their
own APK using the package manager. These methods were modified to
be no-ops in froyo, but the documentation was never completed.
Change-Id: I20f6593445d877a3dae9b9f51d5198a3509255d6
http://b/2811032
Summary:
- libcore: new Java based SamplingProfiler
- dalvik: remove old SamplingProfiler native bits
- frameworks/base: New placeholder SamplingProfilerIntegration
- vendor/google: remove old profiler snapshot parsing code
Details:
libcore
A new 100% Java SamplingProfiler. While it has more overhead that
the old native one, the new one can actually collect more than the
current PC and frame pointer, so you can get useful context of
where your app is spending time. It currently provides ASCII hprof
format output for use with tools like PerfAnal
dalvik/src/main/java/dalvik/system/SamplingProfiler.java
Unit test for the new SamplingProfiler
dalvik/src/test/java/dalvik/system/SamplingProfilerTest.java
Add core-tests-dalvik
JavaLibrary.mk
dalvik
Removing native code that supported the old SamplingProfiler
vm/Dvm.mk
vm/native/InternalNative.c
vm/native/dalvik_system_SamplingProfiler.c
frameworks/base
Placeholder SamplingProfilerIntegration. Later plans include
generating EventStackTrace protobufs.
New SamplingProfiler does not have a global instance, so
SamplingProfilerIntegration provides one in INSTANCE. Old binary
snapshot format is temporily replaced with ASCII hprof data.
core/java/com/android/internal/os/SamplingProfilerIntegration.java
Simplified interface for zygote profile snapshotting
core/java/com/android/internal/os/ZygoteInit.java
Current SamplingProfilerIntegration does not track event loop
explicitly, but hprof information does include thread information.
core/java/android/app/ActivityThread.java
vendor/google
Removing code for parsing old SamplingProfiler snapshot format
tools/samplingprofiler/Android.mk
tools/samplingprofiler/NOTICE
tools/samplingprofiler/profiler.iml
tools/samplingprofiler/profiler.ipr
tools/samplingprofiler/pull-snapshots.sh
tools/samplingprofiler/sorttable.js
tools/samplingprofiler/src/com/android/profiler/PrintHtml.java
Merge commit '73ef5d4e2bcbf28ccb84580439f2f79d5cea1ec7' into gingerbread-plus-aosp
* commit '73ef5d4e2bcbf28ccb84580439f2f79d5cea1ec7':
DO NOT MERGE. CHERRY-PICKED GERRIT CHANGE 60365.
Support complex characters in plugins.
Complex characters like chinese are sent via the onKeyMultiple()
callback. The WebView passes these characters to Webkit so that
non-text inputs (e.g. plugins) can process them.
Change-Id: I49575bb8a583f9f3580f5734ad87cc7c00b2bda9
http://b/2900114
Merge commit '042e9bd989d9c78e23ed29011b6532743f510625' into gingerbread-plus-aosp
* commit '042e9bd989d9c78e23ed29011b6532743f510625':
Add SIP related settings in the Settings.System.
Merge commit '361199b5e742c6635d4d7a03de6cf37b31cf442c' into gingerbread-plus-aosp
* commit '361199b5e742c6635d4d7a03de6cf37b31cf442c':
Add PackageManager API to get information about a provider component.
Merge commit 'd2fbabad1e1fa8de1f0809ec5a2653f8af25dbb3' into gingerbread-plus-aosp
* commit 'd2fbabad1e1fa8de1f0809ec5a2653f8af25dbb3':
Fixed single line state on TextView.
singleLine flag is set to false by default. However, when no singleLine or input
type is provided, the inputType of the TextView is not set to
EditorInfo.TYPE_TEXT_FLAG_MULTI_LINE for edit texts.
Change-Id: Id747d3319afcddb3ab6ae0463947e8b3e470ef73
Merge commit '6eb5ac9ceeb3ff67d38c7ead54b4247e762f278d' into gingerbread-plus-aosp
* commit '6eb5ac9ceeb3ff67d38c7ead54b4247e762f278d':
Fix doc link in InputDevice.
Merge commit '0a77ce277c6ed2aa25bbea5f8cd5687c0720cb68' into gingerbread-plus-aosp
* commit '0a77ce277c6ed2aa25bbea5f8cd5687c0720cb68':
New edge effects for scrolling widgets (overscroll)
TODO: Currently disabled for WebView. Assets used for the glow effect
need to be themable/styleable. Overscroll effect should take place
even when the user did not grab the widget within actual content.
Change-Id: I68277d14d37dc5bcdb9254eaddf6e4998b3f2bf4
Finished the input device capability API.
Added a mechanism for calibrating touch devices to obtain more
accurate information about the touch contact area.
Improved pointer location to show new coordinates and capabilities.
Optimized pointer location display and formatting to avoid allocating large
numbers of temporary objects. The GC churn was causing the application to
stutter very badly when more than a couple of fingers were down).
Added more diagnostics.
Change-Id: Ie25380278ed6f16c5b04cd9df848015850383498
Also removes the artifical restriction that only one apply() can be in
flight at once. That was old from when I thought it'd end up being
required, but wasn't.
Change-Id: I3540ea8be6e0760d6a51d218186f71655c2f3f55
Merge commit '1d22e122a6f278a432519673a8ad3e4853934461' into gingerbread-plus-aosp
* commit '1d22e122a6f278a432519673a8ad3e4853934461':
Fix a monkey crash when the new WebView is destroyed.
Merge commit 'f470ed8630e9e648727443b065b9f1c69fee34d6' into gingerbread-plus-aosp
* commit 'f470ed8630e9e648727443b065b9f1c69fee34d6':
Support surrogate pairs when layouting text
Merge commit '6726d6bb1a30167786864c445cbe0370ee0dd58c' into gingerbread-plus-aosp
* commit '6726d6bb1a30167786864c445cbe0370ee0dd58c':
Support pre-loading browser plugins on the system image.
This change moves the native library handling earlier in the package
installation process so that it may be inserted into ASEC containers
before they are finalized in the DefaultContainerService.
Note that native libraries on SD card requires that vold mount ASEC
containers without the "noexec" flag on the mount point.
Change-Id: Ib34b1886bf6f94b99bb7b3781db6e9b5a58807ba
Merge commit 'd851e6fea59bcc5a9ad4ddcdfde63e9443640ef2' into gingerbread-plus-aosp
* commit 'd851e6fea59bcc5a9ad4ddcdfde63e9443640ef2':
Unhide camera fps range API and deprecate old ones.
Original preview frame rate API assumes the frame rate
is fixed. It does not not work with auto frame rate camera.
Change-Id: I1233a22ed64d42f167432085716bb6bfc3d36bbf
