Merge commit '97e58ef444da53165caab2a7be4fe44c154d5a0e' into gingerbread-plus-aosp
* commit '97e58ef444da53165caab2a7be4fe44c154d5a0e':
DO NOT MERGE Separate utility methods into utility class.
Methods in BluetoothTestUtils remain the same as they were in
BluetoothStressTest except for the constructor and close(). The constructor
is derived from setUp() and close() from tearDown().
Change-Id: Ifce16346f30eccdcc10ab846800e8a6fd2a24361
Merge commit '79492a0d75b0b02f11f35500f79dd3fcbc6e2211' into gingerbread-plus-aosp
* commit '79492a0d75b0b02f11f35500f79dd3fcbc6e2211':
DO NOT MERGE Overscroll continues; asset and behavior tweaks.
Merge commit 'd3efa3924407da6d38aa5931ac29aa088d9eb986' into gingerbread-plus-aosp
* commit 'd3efa3924407da6d38aa5931ac29aa088d9eb986':
Clean up some permissions.
Note that WRITE_OWNER_DATA and READ_OWNER_DATA don't actually appear
to be associated with anything or used by anyone, so they are just
deleted.
Also deprecate the activity API to go in the foreground. I didn't
realize that was released in the SDK. It needs to go away.
Change-Id: I96f53702c2c79e4999b6b2c498abb770bd27e03a
Merge commit 'bc5ec2f91a7ed2836df66f1ed98b019ea1192aa1' into gingerbread-plus-aosp
* commit 'bc5ec2f91a7ed2836df66f1ed98b019ea1192aa1':
Improve messages when java process is starting.
Merge commit 'b766ab830a714c0b79f64265e681f454865ffe65' into gingerbread-plus-aosp
* commit 'b766ab830a714c0b79f64265e681f454865ffe65':
DO NOT MERGE Add deprecated annotation to get/set PluginsPath and update current.xml
Previous changes only added javadoc annotation, but didn't apply
annotation to the source. Fixing this and updating current.xml.
Change-Id: I52aabd6485a3972fc360f24c2e86cc342a5101ab
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.
Merge commit '8f8fcfa319e0e0af14aa8f8555be58555703af02' into gingerbread-plus-aosp
* commit '8f8fcfa319e0e0af14aa8f8555be58555703af02':
Notifications are now light-on-dark in the windowshade.
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
Finally.
This also fixes that little 1px gap that would occasionally
show through to the carbon fiber background (changed to
steel cord for now) between the last notification and the
windowshade's handlebar. It still gaps a little while you're
dragging, due to the asynchronous motion of the various
windows involved, but when the panel is still you shouldn't
see any background. (Man, that drove me crazy.)
Bug: 2949229
Change-Id: If085f4ab7dfb7c3868c30469661907d5d63f070b
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
This was causing stack stitching problems where a one-way call with
violations followed by a two-way call without violations was getting
the previous one-way call's violation stack stitched on to the second
caller's stack.
The solution is a little more indirect than I would've liked
(preserving the binder's onTransact flags until enforceInterface) but
was seemingly necessary to work without changing the AIDL compiler.
It should also be sufficiently cheap, since no new calls to
thread-local IPCThreadState lookups were required. The additional
work is just same-thread getter/setters on the existing
IPCThreadState.
Change-Id: I4b6db1d445c56e868e6d0d7be3ba6849f4ef23ae
Methods in BluetoothTestUtils remain the same as they were in
BluetoothStressTest except for the constructor and close(). The constructor
is derived from setUp() and close() from tearDown().
Change-Id: I09f9637d3969c98e46cbde1d61bc6c3223aec7c1
