24922 Commits

Author SHA1 Message Date
Gilles Debunne
d4723bb415 Revert "Merge "InputMethodManager showSoftInput return documentation." into gingerbread"
This reverts commit 26d708d93624d2d060529b7e33e0a20172e85efd, reversing
changes made to 3ac85d31de6cab5a468b7728b3340cf1b57bc8fe.

Change-Id: Ifc19f837bee7437707ddddf0b19cb6bce53dd2c5
2010-09-02 15:27:47 -07:00
Gilles Debunne
26d708d936 Merge "InputMethodManager showSoftInput return documentation." into gingerbread 2010-09-02 14:50:25 -07:00
Eric Rowe
3ac85d31de am 1314219a: (-s ours) DO NOT MERGE Separate utility methods into utility class.
Merge commit '1314219a37403594f833c2c71744040ebd8d9b04' into gingerbread

* commit '1314219a37403594f833c2c71744040ebd8d9b04':
  DO NOT MERGE Separate utility methods into utility class.
2010-09-02 14:26:12 -07:00
Daisuke Miyakawa
3010713f50 Fix again.
Change-Id: I7393e1e9e9aa3f8612d143840109f1c5193f692f
2010-09-02 13:48:09 -07:00
Daisuke Miyakawa
3bd9b8f04c Fix build breakage.
Change-Id: If519f1730266f10a7852af209127aa4754a7ef9d
2010-09-02 13:42:22 -07:00
Daisuke Miyakawa
b1f5a54a2a Merge "VCard refactoring backport." into gingerbread 2010-09-02 12:56:15 -07:00
Eric Laurent
32ec1ad17f Merge "Fix problem in AudioEffect::command() status." into gingerbread 2010-09-02 12:46:24 -07:00
Eric Laurent
e65280c552 Fix problem in AudioEffect::command() status.
The *pReplyData argument of the command() function was left unitialized by EffectHandle::command()
when command was EFFECT_CMD_ENABLE, EFFECT_CMD_DISABLE and EFFECT_CMD_SET_PARAM_COMMIT.

Change-Id: I91a19817ead2a8cfbdd8e2d77ca270c7ce9d5bd4
2010-09-02 11:56:55 -07:00
Eric Rowe
97e58ef444 Merge "DO NOT MERGE Separate utility methods into utility class." into gingerbread 2010-09-02 11:35:20 -07:00
Eric Rowe
13438b0205 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
2010-09-02 11:29:59 -07:00
Daisuke Miyakawa
69831d9dc1 VCard refactoring backport.
Change-Id: Icf265ce7f83c1e2bd5db0c3d9bd4c142afd6db34
2010-09-02 10:39:00 -07:00
Chia-chi Yeh
dc296b0d4b Merge "SipService: reduce the usage of javax.sdp.*." into gingerbread 2010-09-02 08:13:01 -07:00
Chia-chi Yeh
95b15c3560 SipService: reduce the usage of javax.sdp.*.
After this change, SipAudioCallImpl is the only place still using it.

Change-Id: I5693bffa54f9e19cbfa70b45dfcf40fba04dedbb
2010-09-02 22:15:26 +08:00
Hung-ying Tyan
60264b3064 SipProfile: remove outgoingCallAllowed flag.
Change-Id: I37a215bafce57adf6911c81fd38db324bac686ec
2010-09-02 20:34:17 +08:00
Adam Powell
79492a0d75 Merge "DO NOT MERGE Overscroll continues; asset and behavior tweaks." into gingerbread 2010-09-02 00:28:14 -07:00
Adam Powell
5916882c3f DO NOT MERGE Overscroll continues; asset and behavior tweaks.
Change-Id: I367643877a397e7b4fa9bd8c40639ff69436e7f0
2010-09-02 00:14:53 -07:00
Dianne Hackborn
a1c69e084b Fix a small bug when granting permissions through activity results.
Change-Id: I2a5c4025fb5f566e29c219fde4d50ed2eba6e174
2010-09-01 22:55:02 -07:00
Dianne Hackborn
d3efa39244 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
2010-09-01 21:19:40 -07:00
Dianne Hackborn
bc5ec2f91a Merge "Improve messages when java process is starting." into gingerbread 2010-09-01 21:15:17 -07:00
Dianne Hackborn
08e60f2a16 Improve messages when java process is starting.
Change-Id: I33e401eb240a454845987c10d44e3520e419721b
2010-09-01 19:17:47 -07:00
Jason Chen
b766ab830a 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
2010-09-01 19:04:18 -07:00
Hung-ying Tyan
3424c02e6b Add software features for SIP and VOIP
and block SipService creation and SIP API if the feature is not available.

Change-Id: Icf780af1ac20dda4d8180cea3e5b20e21a8350bc
2010-09-02 08:10:13 +08:00
Andreas Huber
a2511da9d6 Merge "Better support for buffered streaming of rtsp content, if buffer drops below a certain threshold we will temporarily pause playback until we have sufficient data." into gingerbread 2010-09-01 15:44:46 -07:00
James Dong
d3c1bae4eb Merge "Make sure that if initialization fails, AudioSource still behaves well." into gingerbread 2010-09-01 15:41:10 -07:00
Andreas Huber
4d8f66bce3 Better support for buffered streaming of rtsp content, if buffer drops below a certain threshold we will temporarily pause playback until we have sufficient data.
Change-Id: Ice8564e902e48c89c9c00f6651c5504b3c41fcad
related-to-bug: 2556656
2010-09-01 15:05:28 -07:00
Dan Morrill
a800a2efa2 Merge "Adding a feature definition corresponding to support for Near-Field Communications (NFC)." into gingerbread 2010-09-01 15:03:02 -07:00
Nick Kralevich
05f0382bcf When dropping privileges, check return values.
setuid() and family can fail.  Check return values to make
sure this doesn't happen unexpectedly.

Also call setgid() to drop root group permissions.

Change-Id: Id06fbe6239e2ed2fe23368695e333514e0581e6d
2010-09-01 14:44:54 -07:00
Dan Morrill
76437d3793 Adding a feature definition corresponding to support for Near-Field
Communications (NFC).

Change-Id: I32b1b949524bfd978f53e23e02d38dfba4a2ea9c
2010-09-01 14:42:23 -07:00
Andreas Huber
81f339bcfe Merge "Fixing the build." into gingerbread 2010-09-01 14:21:49 -07:00
Andreas Huber
752fe99276 Fixing the build.
Change-Id: I6414a5ed2a92f5e375e19caf7453abd268ce76d3
2010-09-01 14:20:33 -07:00
James Dong
a87544b35f Make sure that if initialization fails, AudioSource still behaves well.
Change-Id: I16dfc90bcb8a324d6ee9a38a5a1a31cc094c820a
2010-09-01 14:11:28 -07:00
Kenny Root
7c1bd7fdbf Fix logic error in downgrade of system apps
A logic error would allow not deleting data when uninstalling a system
app upgrade that's of a newer release than the on on the system
partition. If the system app had a database upgrade and this happened,
you might be in trouble.

Luckily it appears no one ever does this in code. You'd have to manually
get there doing:

adb uninstall -k updated.system.package

Change-Id: I3110fedf2d147975a0635c71898d985dd642a2c1
2010-09-01 14:10:36 -07:00
Kenny Root
fca5677aee Merge "Add null check for package settings" into gingerbread 2010-09-01 14:09:01 -07:00
Kenny Root
9ee9274e5e Add null check for package settings
A few lines down "ps" is run through a null check, so apparently there
could be some screwy system conditions where this is encountered. And,
in fact, this was encountered through an updated system pacakge that
managed to delete the package from /system/app during testing. It left
the PackageSetting in mDisabledSysPackages which would cause a deference
of a null variable.

Change-Id: Ic7faca569abd16a87a8a69c20df08c11a274a001
2010-09-01 13:59:02 -07:00
Adam Powell
e34fe69e66 Merge "DO NOT MERGE Integrate edge effects into WebView." into gingerbread 2010-09-01 13:57:05 -07:00
Andreas Huber
6c33904ad9 Merge "Now that AmrInputStream no longer relies on opencore, make sure it's registered in non-opencore builds." into gingerbread 2010-09-01 13:54:12 -07:00
Andreas Huber
412fc7cdb6 Merge "Keep gtalk video chat specific code consistent with rtsp changes." into gingerbread 2010-09-01 13:39:27 -07:00
Andreas Huber
8d7d413959 Now that AmrInputStream no longer relies on opencore, make sure it's registered in non-opencore builds.
Change-Id: Ia9748691ba60d3c4b5fcaf319ed0b4493d69abc6
related-to-bug: 2963846
2010-09-01 13:27:14 -07:00
Andreas Huber
de2b1615d2 Merge "Properly extract all raw_data_blocks from an ADSP mpeg4 audio buffer." into gingerbread 2010-09-01 12:59:04 -07:00
Andreas Huber
4dcc6a1020 Properly extract all raw_data_blocks from an ADSP mpeg4 audio buffer.
Change-Id: I15e21eae50beb6057024ea42a7e9bf3b8d8a0603
related-to-bug: 2368598
2010-09-01 12:25:36 -07:00
Adam Powell
230269d43b DO NOT MERGE Integrate edge effects into WebView.
TODO Effect for scaling gestures; asset/polish tweaks.

Change-Id: Ifbc201cb64e0610dbc92a7c57ba0d3a4ee686c43
2010-09-01 11:56:56 -07:00
Daniel Sandler
b1387127f1 Merge "Fix build (restore deleted assets)." into gingerbread 2010-09-01 11:46:16 -07:00
Daniel Sandler
a3c3edc68f Fix build (restore deleted assets).
Change-Id: I89362191131e2e8e3d276ab8444edd0d5041211c
2010-09-01 14:43:59 -04:00
Derek Sollenberger
1614843e93 Merge "Fix invalid comment in WebSettings." into gingerbread 2010-09-01 11:30:12 -07:00
Derek Sollenberger
fdbdeb3137 Fix invalid comment in WebSettings.
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
2010-09-01 14:15:50 -04:00
Daniel Sandler
8f8fcfa319 Notifications are now light-on-dark in the windowshade.
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
2010-09-01 14:02:30 -04:00
Brian Carlstrom
1751086360 New Java-based SamplingProfiler
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
2010-09-01 10:17:25 -07:00
Andreas Huber
27b9c8ec16 Keep gtalk video chat specific code consistent with rtsp changes.
Change-Id: I5f3f46c2150e16b26674432e427f79c04a69cd8e
2010-09-01 09:27:47 -07:00
Derek Sollenberger
73ef5d4e2b 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
2010-09-01 09:01:48 -04:00
Jesse Wilson
795b8aa4a3 Merge "Removing AWT. See bug 2732079" into gingerbread 2010-08-31 22:50:31 -07:00