Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22682a5a authored by Marco Nelissen's avatar Marco Nelissen Committed by Android (Google) Code Review
Browse files

Merge "Make MediaPlayer.invoke() public-and-hidden again"

parents 10159423 2d2cd32c

media/java/android/media/MediaPlayer.java

+4 −2
Original line number Diff line number Diff line
@@ -619,8 +619,9 @@ public class MediaPlayer 
     *

     * @return A parcel suitable to hold a request for the native

     * player.

     * {@hide}

     */

    private Parcel newRequest() {

    public Parcel newRequest() {

        Parcel parcel = Parcel.obtain();

        parcel.writeInterfaceToken(IMEDIA_PLAYER);

        return parcel;
@@ -638,8 +639,9 @@ public class MediaPlayer 
     *

     * @param reply Output parcel with the data returned by the

     * native player.

     * {@hide}

     */

    private void invoke(Parcel request, Parcel reply) {

    public void invoke(Parcel request, Parcel reply) {

        int retcode = native_invoke(request, reply);

        reply.setDataPosition(0);

        if (retcode != 0) {

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaFrameworkTestRunner.java

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.mediaframeworktest; 
import com.android.mediaframeworktest.functional.CameraTest;

import com.android.mediaframeworktest.functional.MediaMetadataTest;

import com.android.mediaframeworktest.functional.MediaMimeTest;

import com.android.mediaframeworktest.functional.MediaPlayerInvokeTest;

import com.android.mediaframeworktest.functional.mediaplayback.MediaPlayerApiTest;

import com.android.mediaframeworktest.functional.mediarecorder.MediaRecorderTest;

import com.android.mediaframeworktest.functional.audio.SimTonesTest;
@@ -66,6 +67,7 @@ public class MediaFrameworkTestRunner extends InstrumentationTestRunner { 
        suite.addTestSuite(MediaRecorderTest.class);

        suite.addTestSuite(MediaAudioTrackTest.class);

        suite.addTestSuite(MediaMimeTest.class);

        suite.addTestSuite(MediaPlayerInvokeTest.class);

        suite.addTestSuite(MediaAudioManagerTest.class);

        suite.addTestSuite(MediaAudioEffectTest.class);

        suite.addTestSuite(MediaBassBoostTest.class);

media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerInvokeTest.java

0 → 100644
+71 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2009 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.mediaframeworktest.functional;



import com.android.mediaframeworktest.MediaFrameworkTest;

import com.android.mediaframeworktest.MediaNames;



import android.test.ActivityInstrumentationTestCase2;

import android.util.Log;

import android.test.suitebuilder.annotation.LargeTest;

import android.test.suitebuilder.annotation.MediumTest;

import android.test.suitebuilder.annotation.Suppress;



import android.media.MediaPlayer;

import android.os.Parcel;



import java.util.Calendar;

import java.util.Random;



// Tests for the invoke method in the MediaPlayer.

public class MediaPlayerInvokeTest extends ActivityInstrumentationTestCase2<MediaFrameworkTest> {

   private static final String TAG = "MediaPlayerInvokeTest";

   private MediaPlayer mPlayer;

   private Random rnd;



   public MediaPlayerInvokeTest() {

       super("com.android.mediaframeworktest", MediaFrameworkTest.class);

       rnd = new Random(Calendar.getInstance().getTimeInMillis());

    }



    @Override

    protected void setUp() throws Exception {

      super.setUp();

      mPlayer = new MediaPlayer();

    }



    @Override

    protected void tearDown() throws Exception {

        mPlayer.release();

        super.tearDown();

    }



    // Generate a random number, sends it to the ping test player.

    @Suppress

    @MediumTest

    public void testPing() throws Exception {

        mPlayer.setDataSource("test:invoke_mock_media_player.so?url=ping");



        Parcel request = mPlayer.newRequest();

        Parcel reply = Parcel.obtain();



        int val = rnd.nextInt();

        request.writeInt(val);

        mPlayer.invoke(request, reply);

        assertEquals(val, reply.readInt());

   }

}