34 Commits

Author SHA1 Message Date
Android (Google) Code Review
548b9920a8 am 2d9f3169: Merge change 5595 into donut
Merge commit '2d9f31697fb5ece89c80cc66bdd3bd9caa9df9c3'

* commit '2d9f31697fb5ece89c80cc66bdd3bd9caa9df9c3':
  We might try to close the Vorbis file twice under certain
2009-06-29 20:20:04 -07:00
Dave Sparks
978811960a We might try to close the Vorbis file twice under certain
circumstances. This fix nulls the mFile member so we don't
try to close it twice. Bug 1904783.
2009-06-26 17:24:22 -07:00
Nicolas Catania
20cb94eeb5 Direct api to the native media player.
MediaPlayer.java has 3 new methods:
* newRequest creates a Parcel that can be used to send data to the
  native player using invoke.
* invoke issues synchronous calls to the native player using opaque
  parcels for the request and reply.

IMediaPlayer.h has 1 new abstract method:
* invoke

The Midi and Vorbis players have a stub for these. So far only PV
makes use of that new feature.

To avoid any copy overhead, the JNI interface uses Parcel as a java
object (no serialization/copy happens at the JNI layer).

The remote interface token is inserted when the Parcel is constructed
in java. That way the parcel is already routable when it reaches
 IMediaPlayer.cpp (proxy). No extra copy is needed there.
2009-06-24 08:22:52 -07:00
Mathias Agopian
3b4062eeb0 get rid of utils.h 2009-05-31 19:13:00 -07:00
Android (Google) Code Review
183baba8d1 am c1c82509: Merge change 2163 into donut
Merge commit 'c1c82509fb78403a969040cf057a66cbe3bfa538'

* commit 'c1c82509fb78403a969040cf057a66cbe3bfa538':
  Fix permission hole for RECORD_AUDIO created when we moved the MediaRecorder
2009-05-20 22:44:17 -07:00
Dave Sparks
6690dc5454 Fix permission hole for RECORD_AUDIO created when we moved the MediaRecorder
implementation to the mediaserver process. The permission check was previously
enforced only at the AudioRecord binder interface for clients not in the same
process. This change adds an additional check when the client tries to set
the audio source.
Bug 1868334
2009-05-20 19:20:31 -07:00
Mathias Agopian
0795272aa2 move libbinder's header files under includes/binder 2009-05-20 12:55:03 -07:00
Mathias Agopian
25ba5b6564 checkpoint: split libutils into libutils + libbinder 2009-05-20 12:55:02 -07:00
James Dong
c02cac481c Change 79 in git master branch 2009-04-30 23:42:56 -07:00
Android (Google) Code Review
c2bc16cd5a am 7fe3b06: Merge change 740 into donut
Merge commit '7fe3b064d3645fcebd09b162c5989e0d702112e2'

* commit '7fe3b064d3645fcebd09b162c5989e0d702112e2':
  MIDI render thread was nice 0, should be nice -16.
2009-04-29 15:43:34 -07:00
Android (Google) Code Review
7fe3b064d3 Merge change 740 into donut
* changes:
  MIDI render thread was nice 0, should be nice -16. Seems like a recent change sets the thread priority to 0. Previously it inherited priority from the parent thread. This change sets the MIDI render thread priority to the default for audio threads. Reference bug 1800905
2009-04-29 15:27:15 -07:00
Android (Google) Code Review
ef77be9526 am 9f98f79: Merge change 739 into donut
Merge commit '9f98f79f8eb41889dec36e0a76aaf0414b39bb3a'

* commit '9f98f79f8eb41889dec36e0a76aaf0414b39bb3a':
  Vorbis render thread was nice 0, should be nice -16.
2009-04-29 13:41:22 -07:00
Dave Sparks
c082769b67 MIDI render thread was nice 0, should be nice -16.
Seems like a recent change sets the thread priority to 0. Previously it
inherited priority from the parent thread. This change sets the MIDI
render thread priority to the default for audio threads.
Reference bug 1800905
2009-04-29 12:59:33 -07:00
Dave Sparks
0e051b189f Vorbis render thread was nice 0, should be nice -16.
Seems like a recent change sets the thread priority to 0. Previously it
inherited priority from the parent thread. This change sets the Vorbis
render thread priority to the default for audio threads.
Reference bug 1800905
2009-04-29 12:42:28 -07:00
Jianhong Jiang
3ca47d101d Squashed commit of the following:
commit b6cf47306b642f7cf7e1b55cce448e0deff38f36
Author: Jianhong Jiang <jianhong@google.com>
Date:   Mon Apr 13 11:07:01 2009 -0700

    Change tabs into 4 spaces.

commit 93c5890dbcc68e37aa0ef039b4a203acddca8968
Author: Jianhong Jiang <jianhong@google.com>
Date:   Fri Apr 10 14:15:23 2009 -0700

    OpenCore 2.02 related changes.
2009-04-13 19:01:51 -07:00
Jean-Baptiste Queru
bb038d1604 Revert "Changes required to accommodate OpenCORE 2.0"
This reverts commit ea780b689f8ee3dff355deab2434bbd4ae04d208.

Conflicts:

	media/libmediaplayerservice/Android.mk
2009-04-08 14:40:48 -07:00
Dave Sparks
b8c055e7cb AI 143267: am: CL 143127 Media recorder service requires android.permission.CAMERA to record video
Original author: davidsparks
  Merged from: //branches/cupcake/...

Automated import of CL 143267
2009-03-27 20:28:22 -07:00
The Android Open Source Project
b41349409b Merge commit 'goog/cupcake' 2009-03-27 18:48:32 -07:00
The Android Open Source Project
e1861133d5 Merge commit 'korg/cupcake'
Conflicts:
	core/java/android/webkit/WebView.java
	core/java/android/widget/TwoLineListItem.java
	preloaded-classes
2009-03-27 15:38:40 -07:00
Dave Sparks
ba9844ee12 AI 143127: Media recorder service requires android.permission.CAMERA to record video
BUG=1742392

Automated import of CL 143127
2009-03-27 12:57:40 -07:00
Dave Sparks
6ee2e78e1c Automated import from //branches/donutburger/...@141593,141593 2009-03-24 20:35:44 -07:00
Dave Sparks
cb9a44ed08 Automated import from //branches/cupcake/...@141591,141591 2009-03-24 17:57:12 -07:00
Jean-Baptiste Queru
680f8c77d5 Deal better with situations where OpenCORE is disabled. 2009-03-23 12:00:23 -07:00
Jean-Baptiste Queru
2a73de7b21 Merge commit 'remotes/korg/cupcake' into merge
Conflicts:
	core/java/android/view/animation/TranslateAnimation.java
	core/jni/Android.mk
	core/res/res/values-en-rGB/strings.xml
	libs/audioflinger/AudioFlinger.cpp
	libs/surfaceflinger/LayerScreenshot.cpp
	packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
2009-03-18 11:33:14 -07:00
The Android Open Source Project
ba87e3e6c9 auto import from //branches/cupcake_rel/...@138607 2009-03-13 13:04:22 -07:00
The Android Open Source Project
9066cfe988 auto import from //depot/cupcake/@135843 2009-03-03 19:31:44 -08:00
The Android Open Source Project
d83a98f4ce auto import from //depot/cupcake/@135843 2009-03-03 18:28:45 -08:00
The Android Open Source Project
076357b856 auto import from //depot/cupcake/@132589 2009-03-03 14:04:24 -08:00
The Android Open Source Project
3dec7d563a auto import from //depot/cupcake/@137055 2009-03-02 22:54:33 -08:00
The Android Open Source Project
da996f390e auto import from //branches/cupcake/...@131421 2009-02-13 12:57:50 -08:00
The Android Open Source Project
d24b8183b9 auto import from //branches/cupcake/...@130745 2009-02-10 15:44:00 -08:00
Brock Atchison
ea780b689f Changes required to accommodate OpenCORE 2.0 2009-01-21 19:00:25 -06:00
The Android Open Source Project
f013e1afd1 Code drop from //branches/cupcake/...@124589 2008-12-17 18:05:43 -08:00
The Android Open Source Project
54b6cfa9a9 Initial Contribution 2008-10-21 07:00:00 -07:00