30173 Commits

Author SHA1 Message Date
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
Kenny Root
11d12f7efc am fca5677a: Merge "Add null check for package settings" into gingerbread
Merge commit 'fca5677aeefc3b9cbaecefbb10d5ccbaff974391' into gingerbread-plus-aosp

* commit 'fca5677aeefc3b9cbaecefbb10d5ccbaff974391':
  Add null check for package settings
2010-09-01 14:12:26 -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
Dianne Hackborn
23600cec3d Merge "Missing clean step." 2010-09-01 14:07:18 -07:00
Adam Powell
6fb81376b6 am e34fe69e: Merge "DO NOT MERGE Integrate edge effects into WebView." into gingerbread
Merge commit 'e34fe69e66d8c9bc76453347ba84261b060300f3' into gingerbread-plus-aosp

* commit 'e34fe69e66d8c9bc76453347ba84261b060300f3':
  DO NOT MERGE Integrate edge effects into WebView.
2010-09-01 14:01:44 -07:00
Jamie Gennis
8a643b411e Merge "Add the new Stagefright ANativeWindow OMX codec API." 2010-09-01 14:00:33 -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
Andreas Huber
71c908c475 am 6c33904a: Merge "Now that AmrInputStream no longer relies on opencore, make sure it\'s registered in non-opencore builds." into gingerbread
Merge commit '6c33904ad948cb64245fbc5950c839e4d9e56de3' into gingerbread-plus-aosp

* commit '6c33904ad948cb64245fbc5950c839e4d9e56de3':
  Now that AmrInputStream no longer relies on opencore, make sure it's registered in non-opencore builds.
2010-09-01 13:57:44 -07:00
Adam Powell
e34fe69e66 Merge "DO NOT MERGE Integrate edge effects into WebView." into gingerbread 2010-09-01 13:57:05 -07:00
Alex Sakhartchouk
73ea9beaf8 Merge "Cleaning up the api" 2010-09-01 13:55:16 -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
Daisuke Miyakawa
f90132b3fe Merge "Clarify the behavior of ListView#setColorHint()." 2010-09-01 13:50:20 -07:00
Nipun Kwatra
239f2e5b01 Support for auxiliary video parameters.
Added support for passing width, height and video bitrate
for the auxiliary video.
Also setting encoder level depending on the video size and bitrate.

Change-Id: I4a90046853f67287c3e7e6babc75b4827f0c3e73
2010-09-01 13:46:46 -07:00
Andreas Huber
52d14be119 am 47f2cf62: am 412fc7cd: Merge "Keep gtalk video chat specific code consistent with rtsp changes." into gingerbread
Merge commit '47f2cf620731226a9311db0f864a4e1404e54b96'

* commit '47f2cf620731226a9311db0f864a4e1404e54b96':
  Keep gtalk video chat specific code consistent with rtsp changes.
2010-09-01 13:45:30 -07:00
Andreas Huber
47f2cf6207 am 412fc7cd: Merge "Keep gtalk video chat specific code consistent with rtsp changes." into gingerbread
Merge commit '412fc7cdb6a1c4b6afe85b58fcc794fd67271942' into gingerbread-plus-aosp

* commit '412fc7cdb6a1c4b6afe85b58fcc794fd67271942':
  Keep gtalk video chat specific code consistent with rtsp changes.
2010-09-01 13:42:46 -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
Dianne Hackborn
054de0aae7 Missing clean step.
Change-Id: Ib91fbfe3c28bf97f88de1b0c1df697a41ac0cc27
2010-09-01 13:33:16 -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
564a9f2434 am 021a822e: am de2b1615: Merge "Properly extract all raw_data_blocks from an ADSP mpeg4 audio buffer." into gingerbread
Merge commit '021a822e76ab34a6404486e23157db6b6c50ec3e'

* commit '021a822e76ab34a6404486e23157db6b6c50ec3e':
  Properly extract all raw_data_blocks from an ADSP mpeg4 audio buffer.
2010-09-01 13:21:13 -07:00
Daniel Sandler
901fd85c53 am 9ce87963: (-s ours) am b1387127: Merge "Fix build (restore deleted assets)." into gingerbread
Merge commit '9ce879636ebe6e7eabbe4fa3f525cea25d5d9c10'

* commit '9ce879636ebe6e7eabbe4fa3f525cea25d5d9c10':
  Fix build (restore deleted assets).
2010-09-01 13:21:07 -07:00
Derek Sollenberger
edb3211c85 am 27c6f7d4: am 1614843e: Merge "Fix invalid comment in WebSettings." into gingerbread
Merge commit '27c6f7d44c592ab8685b93a2ec30a74d594c822d'

* commit '27c6f7d44c592ab8685b93a2ec30a74d594c822d':
  Fix invalid comment in WebSettings.
2010-09-01 13:18:40 -07:00
Daniel Sandler
1b1c9a2e7f am 036b3157: (-s ours) am 8f8fcfa3: Notifications are now light-on-dark in the windowshade.
Merge commit '036b315747200b27cb1d5bc2d7d7cda9b9f8f1f0'

* commit '036b315747200b27cb1d5bc2d7d7cda9b9f8f1f0':
  Notifications are now light-on-dark in the windowshade.
2010-09-01 13:18:28 -07:00
Daisuke Miyakawa
5be37c81a7 Clarify the behavior of ListView#setColorHint().
Bug: 2965521
Change-Id: Iacd139b0e9eec4bfdd007eb1391cc45c1d889b00
2010-09-01 13:09:08 -07:00
Jamie Gennis
dab357bfd0 Add the new Stagefright ANativeWindow OMX codec API.
This change defines the two OMX_SetParameter calls that enable OMX codecs to
interact with ANativeWindows.  It also adds the plumbing to the IOMX, OMX, and
OMXNodeInstance classes to use these new APIs.

Change-Id: Ibfbf893dc3513db0b3d3221bec5708c77287cddc
2010-09-01 13:07:08 -07:00
Andreas Huber
021a822e76 am de2b1615: Merge "Properly extract all raw_data_blocks from an ADSP mpeg4 audio buffer." into gingerbread
Merge commit 'de2b1615d27881d98f483fc9158497fbe1fc5f8d' into gingerbread-plus-aosp

* commit 'de2b1615d27881d98f483fc9158497fbe1fc5f8d':
  Properly extract all raw_data_blocks from an ADSP mpeg4 audio buffer.
2010-09-01 13:03:27 -07:00
Daniel Sandler
804eb85834 Fix longpress on Menu showing IME.
Bug: 2964208
Change-Id: I1e66ed95978a7b67ede32d08cc32ddf161cb85e0
2010-09-01 16:02:55 -04: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
Elliott Slaughter
7c2d1353f5 Cleanup temporary incognito mode files after last tab closes.
Change-Id: Iae5df353fdfd36c8eefa273a8812e80309e42841
2010-09-01 12:55:52 -07:00
Brian Carlstrom
c9ad7c6dbb resolved conflicts for merge of 41e99538 to master
Change-Id: Idddb72e369f127cd74322c3c7385701c2412e343
2010-09-01 12:41:36 -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
Alex Sakhartchouk
32fc363c8c Cleaning up the api
Change-Id: I86632cfde07216be7623177516710db5d9a57522
2010-09-01 12:17:10 -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
9ce879636e am b1387127: Merge "Fix build (restore deleted assets)." into gingerbread
Merge commit 'b1387127f18b73d7f1038dad6e432329b78264ae' into gingerbread-plus-aosp

* commit 'b1387127f18b73d7f1038dad6e432329b78264ae':
  Fix build (restore deleted assets).
2010-09-01 11:48:19 -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
27c6f7d44c am 1614843e: Merge "Fix invalid comment in WebSettings." into gingerbread
Merge commit '1614843e93d98910147380969d034009ecb23aa2' into gingerbread-plus-aosp

* commit '1614843e93d98910147380969d034009ecb23aa2':
  Fix invalid comment in WebSettings.
2010-09-01 11:32:16 -07:00
Derek Sollenberger
1614843e93 Merge "Fix invalid comment in WebSettings." into gingerbread 2010-09-01 11:30:12 -07:00
Daniel Sandler
036b315747 am 8f8fcfa3: Notifications are now light-on-dark in the windowshade.
Merge commit '8f8fcfa319e0e0af14aa8f8555be58555703af02' into gingerbread-plus-aosp

* commit '8f8fcfa319e0e0af14aa8f8555be58555703af02':
  Notifications are now light-on-dark in the windowshade.
2010-09-01 11:24:40 -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
Joe Onorato
7e3cf12e75 Don't try to dist the stubs or comment check docs builds.
Change-Id: I0c567f28af8111cdb0eada30b8c0a30091967cd7
2010-09-01 10:45:04 -07:00
Brian Carlstrom
41e9953863 am 17510863: New Java-based SamplingProfiler
Merge commit '1751086360056bc60d00f2ed2988bc82be9e7bd9' into gingerbread-plus-aosp

* commit '1751086360056bc60d00f2ed2988bc82be9e7bd9':
  New Java-based SamplingProfiler
2010-09-01 10:44:56 -07: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
Cary Clark
173a86b6d7 Merge "add web setting for enabling/disabling synthetic links" 2010-09-01 10:13:24 -07:00
Robert Greenwalt
f6682b0317 Fix NPE in toString
bug:2965739
Change-Id: Ic3f274cba8ac668d86a8f69f1b2b738d348b3977
2010-09-01 10:09:40 -07:00
Cyrus Master
78a99cea0d Adds creation and last-modified timestamps to the bookmarks contract for the browser provider.
Change-Id: Ib6d733e3b93fc854b3ddb5c011f61534462cb266
2010-09-01 09:55:29 -07:00
Cary Clark
6c43d5231d add web setting for enabling/disabling synthetic links
According to this feature request

http://b/1865484

Some webviews wish to load pages and ignore the
email, phone, and postal addresses. Add a way
to specify that preference to the WebView class.

Change-Id: I6c077c6704e821206a8d653cce4036cecfba2e54
2010-09-01 12:52:13 -04:00