Merge "DO NOT MERGE: Remove MediaBrowserServiceImplApi24" into nyc-support-25.4-dev
diff --git a/media-compat/java/android/support/v4/media/MediaBrowserServiceCompat.java b/media-compat/java/android/support/v4/media/MediaBrowserServiceCompat.java
index f78132e..7ff6a20 100644
--- a/media-compat/java/android/support/v4/media/MediaBrowserServiceCompat.java
+++ b/media-compat/java/android/support/v4/media/MediaBrowserServiceCompat.java
@@ -299,9 +299,11 @@
rootExtras = new Bundle();
rootExtras.putInt(EXTRA_SERVICE_VERSION, SERVICE_VERSION_CURRENT);
BundleCompat.putBinder(rootExtras, EXTRA_MESSENGER_BINDER, mMessenger.getBinder());
- IMediaSession extraBinder = mSession.getExtraBinder();
- BundleCompat.putBinder(rootExtras, EXTRA_SESSION_BINDER,
- extraBinder == null ? null : extraBinder.asBinder());
+ if (mSession != null) {
+ IMediaSession extraBinder = mSession.getExtraBinder();
+ BundleCompat.putBinder(rootExtras, EXTRA_SESSION_BINDER,
+ extraBinder == null ? null : extraBinder.asBinder());
+ }
}
BrowserRoot root = MediaBrowserServiceCompat.this.onGetRoot(
clientPackageName, clientUid, rootHints);
diff --git a/media-compat/java/android/support/v4/media/session/MediaSessionCompat.java b/media-compat/java/android/support/v4/media/session/MediaSessionCompat.java
index b7581f0..eac0d6d 100644
--- a/media-compat/java/android/support/v4/media/session/MediaSessionCompat.java
+++ b/media-compat/java/android/support/v4/media/session/MediaSessionCompat.java
@@ -713,6 +713,39 @@
return new MediaSessionCompat(context, new MediaSessionImplApi21(mediaSession));
}
+ private static PlaybackStateCompat getStateWithUpdatedPosition(
+ PlaybackStateCompat state, MediaMetadataCompat metadata) {
+ if (state == null || state.getPosition() == PlaybackStateCompat.PLAYBACK_POSITION_UNKNOWN) {
+ return state;
+ }
+
+ if (state.getState() == PlaybackStateCompat.STATE_PLAYING
+ || state.getState() == PlaybackStateCompat.STATE_FAST_FORWARDING
+ || state.getState() == PlaybackStateCompat.STATE_REWINDING) {
+ long updateTime = state.getLastPositionUpdateTime();
+ if (updateTime > 0) {
+ long currentTime = SystemClock.elapsedRealtime();
+ long position = (long) (state.getPlaybackSpeed() * (currentTime - updateTime))
+ + state.getPosition();
+ long duration = -1;
+ if (metadata != null && metadata.containsKey(
+ MediaMetadataCompat.METADATA_KEY_DURATION)) {
+ duration = metadata.getLong(MediaMetadataCompat.METADATA_KEY_DURATION);
+ }
+
+ if (duration >= 0 && position > duration) {
+ position = duration;
+ } else if (position < 0) {
+ position = 0;
+ }
+ return new PlaybackStateCompat.Builder(state)
+ .setState(state.getState(), position, state.getPlaybackSpeed(), currentTime)
+ .build();
+ }
+ }
+ return state;
+ }
+
/**
* Receives transport controls, media buttons, and commands from controllers
* and the system. The callback may be set using {@link #setCallback}.
@@ -1987,43 +2020,6 @@
}
}
- PlaybackStateCompat getStateWithUpdatedPosition() {
- PlaybackStateCompat state;
- long duration = -1;
- synchronized (mLock) {
- state = mState;
- if (mMetadata != null
- && mMetadata.containsKey(MediaMetadataCompat.METADATA_KEY_DURATION)) {
- duration = mMetadata.getLong(MediaMetadataCompat.METADATA_KEY_DURATION);
- }
- }
-
- PlaybackStateCompat result = null;
- if (state != null) {
- if (state.getState() == PlaybackStateCompat.STATE_PLAYING
- || state.getState() == PlaybackStateCompat.STATE_FAST_FORWARDING
- || state.getState() == PlaybackStateCompat.STATE_REWINDING) {
- long updateTime = state.getLastPositionUpdateTime();
- long currentTime = SystemClock.elapsedRealtime();
- if (updateTime > 0) {
- long position = (long) (state.getPlaybackSpeed()
- * (currentTime - updateTime)) + state.getPosition();
- if (duration >= 0 && position > duration) {
- position = duration;
- } else if (position < 0) {
- position = 0;
- }
- PlaybackStateCompat.Builder builder = new PlaybackStateCompat.Builder(
- state);
- builder.setState(state.getState(), position, state.getPlaybackSpeed(),
- currentTime);
- result = builder.build();
- }
- }
- }
- return result == null ? state : result;
- }
-
void sendVolumeInfoChanged(ParcelableVolumeInfo info) {
int size = mControllerCallbacks.beginBroadcast();
for (int i = size - 1; i >= 0; i--) {
@@ -2368,7 +2364,13 @@
@Override
public PlaybackStateCompat getPlaybackState() {
- return getStateWithUpdatedPosition();
+ PlaybackStateCompat state;
+ MediaMetadataCompat metadata;
+ synchronized (mLock) {
+ state = mState;
+ metadata = mMetadata;
+ }
+ return getStateWithUpdatedPosition(state, metadata);
}
@Override
@@ -2683,6 +2685,7 @@
new RemoteCallbackList<>();
private PlaybackStateCompat mPlaybackState;
+ private MediaMetadataCompat mMetadata;
@RatingCompat.Style int mRatingType;
boolean mCaptioningEnabled;
@PlaybackStateCompat.RepeatMode int mRepeatMode;
@@ -2780,6 +2783,7 @@
@Override
public void setMetadata(MediaMetadataCompat metadata) {
+ mMetadata = metadata;
MediaSessionCompatApi21.setMetadata(mSessionObj,
metadata == null ? null : metadata.getMediaMetadata());
}
@@ -3094,7 +3098,7 @@
@Override
public PlaybackStateCompat getPlaybackState() {
- return mPlaybackState;
+ return getStateWithUpdatedPosition(mPlaybackState, mMetadata);
}
@Override
diff --git a/media-compat/tests/AndroidManifest.xml b/media-compat/tests/AndroidManifest.xml
index e58817a..eda8df2 100644
--- a/media-compat/tests/AndroidManifest.xml
+++ b/media-compat/tests/AndroidManifest.xml
@@ -42,6 +42,11 @@
<action android:name="android.media.browse.MediaBrowserService"/>
</intent-filter>
</service>
+ <service android:name="android.support.v4.media.StubMediaBrowserServiceCompatWithDelayedMediaSession">
+ <intent-filter>
+ <action android:name="android.media.browse.MediaBrowserService"/>
+ </intent-filter>
+ </service>
</application>
<instrumentation
diff --git a/media-compat/tests/src/android/support/v4/media/MediaBrowserServiceCompatTest.java b/media-compat/tests/src/android/support/v4/media/MediaBrowserServiceCompatTest.java
index dd4dcd2..8aa5a10 100644
--- a/media-compat/tests/src/android/support/v4/media/MediaBrowserServiceCompatTest.java
+++ b/media-compat/tests/src/android/support/v4/media/MediaBrowserServiceCompatTest.java
@@ -24,6 +24,7 @@
import static junit.framework.Assert.assertTrue;
import android.content.ComponentName;
+import android.os.Build;
import android.os.Bundle;
import android.support.test.filters.LargeTest;
import android.support.test.filters.SmallTest;
@@ -47,6 +48,11 @@
private static final ComponentName TEST_BROWSER_SERVICE = new ComponentName(
"android.support.mediacompat.test",
"android.support.v4.media.StubMediaBrowserServiceCompat");
+ private static final ComponentName TEST_BROWSER_SERVICE_DELAYED_MEDIA_SESSION =
+ new ComponentName(
+ "android.support.mediacompat.test",
+ "android.support.v4.media"
+ + ".StubMediaBrowserServiceCompatWithDelayedMediaSession");
private static final String TEST_KEY_1 = "key_1";
private static final String TEST_VALUE_1 = "value_1";
private static final String TEST_KEY_2 = "key_2";
@@ -63,6 +69,7 @@
private final SearchCallback mSearchCallback = new SearchCallback();
private MediaBrowserCompat mMediaBrowser;
+ private MediaBrowserCompat mMediaBrowserForDelayedMediaSession;
private StubMediaBrowserServiceCompat mMediaBrowserService;
private Bundle mRootHints;
@@ -371,6 +378,35 @@
assertEquals(val, browserRoot.getExtras().getString(key));
}
+ @Test
+ @SmallTest
+ public void testDelayedSetSessionToken() throws Exception {
+ if (Build.VERSION.SDK_INT == 21) {
+ return;
+ }
+ final ConnectionCallbackForDelayedMediaSession callback =
+ new ConnectionCallbackForDelayedMediaSession();
+
+ getInstrumentation().runOnMainSync(new Runnable() {
+ @Override
+ public void run() {
+ mMediaBrowserForDelayedMediaSession =
+ new MediaBrowserCompat(getInstrumentation().getTargetContext(),
+ TEST_BROWSER_SERVICE_DELAYED_MEDIA_SESSION, callback, null);
+ }
+ });
+
+ synchronized (mWaitLock) {
+ mMediaBrowserForDelayedMediaSession.connect();
+ mWaitLock.wait(WAIT_TIME_FOR_NO_RESPONSE_MS);
+ assertEquals(0, callback.mConnectedCount);
+
+ StubMediaBrowserServiceCompatWithDelayedMediaSession.sInstance.callSetSessionToken();
+ mWaitLock.wait(TIME_OUT_MS);
+ assertEquals(1, callback.mConnectedCount);
+ }
+ }
+
private void assertRootHints(MediaItem item) {
Bundle rootHints = item.getDescription().getExtras();
assertNotNull(rootHints);
@@ -527,4 +563,18 @@
mData = null;
}
}
+
+ private class ConnectionCallbackForDelayedMediaSession extends
+ MediaBrowserCompat.ConnectionCallback {
+ private int mConnectedCount = 0;
+
+ @Override
+ public void onConnected() {
+ synchronized (mWaitLock) {
+ mConnectedCount++;
+ mWaitLock.notify();
+ }
+ }
+ };
+
}
diff --git a/media-compat/tests/src/android/support/v4/media/StubMediaBrowserServiceCompatWithDelayedMediaSession.java b/media-compat/tests/src/android/support/v4/media/StubMediaBrowserServiceCompatWithDelayedMediaSession.java
new file mode 100644
index 0000000..e93c940
--- /dev/null
+++ b/media-compat/tests/src/android/support/v4/media/StubMediaBrowserServiceCompatWithDelayedMediaSession.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2017 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 android.support.v4.media;
+
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.media.session.MediaSessionCompat;
+
+import java.util.List;
+
+/**
+ * Stub implementation of {@link MediaBrowserServiceCompat}.
+ * This implementation does not call
+ * {@link MediaBrowserServiceCompat#setSessionToken(MediaSessionCompat.Token)} in its
+ * {@link android.app.Service#onCreate}.
+ */
+public class StubMediaBrowserServiceCompatWithDelayedMediaSession extends
+ MediaBrowserServiceCompat {
+
+ static StubMediaBrowserServiceCompatWithDelayedMediaSession sInstance;
+ private MediaSessionCompat mSession;
+
+ @Override
+ public void onCreate() {
+ super.onCreate();
+ sInstance = this;
+ mSession = new MediaSessionCompat(
+ this, "StubMediaBrowserServiceCompatWithDelayedMediaSession");
+ }
+
+ @Nullable
+ @Override
+ public BrowserRoot onGetRoot(@NonNull String clientPackageName,
+ int clientUid, @Nullable Bundle rootHints) {
+ return new BrowserRoot("StubRootId", null);
+ }
+
+ @Override
+ public void onLoadChildren(@NonNull String parentId,
+ @NonNull Result<List<MediaBrowserCompat.MediaItem>> result) {
+ result.detach();
+ }
+
+ void callSetSessionToken() {
+ setSessionToken(mSession.getSessionToken());
+ }
+}
diff --git a/media-compat/tests/src/android/support/v4/media/session/MediaControllerCompatTest.java b/media-compat/tests/src/android/support/v4/media/session/MediaControllerCompatTest.java
index 5c54510..d72e499 100644
--- a/media-compat/tests/src/android/support/v4/media/session/MediaControllerCompatTest.java
+++ b/media-compat/tests/src/android/support/v4/media/session/MediaControllerCompatTest.java
@@ -24,16 +24,19 @@
import static org.junit.Assert.fail;
import android.media.AudioManager;
+import android.media.session.MediaController;
+import android.media.session.MediaSession;
+import android.media.session.PlaybackState;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
import android.os.ResultReceiver;
+import android.os.SystemClock;
import android.support.test.filters.SmallTest;
import android.support.test.runner.AndroidJUnit4;
import android.support.v4.media.MediaDescriptionCompat;
-import android.support.v4.media.PollingCheck;
import android.support.v4.media.RatingCompat;
import android.support.v4.media.VolumeProviderCompat;
@@ -55,6 +58,8 @@
private static final float DELTA = 1e-4f;
private static final boolean ENABLED = true;
private static final boolean DISABLED = false;
+ private static final long TEST_POSITION = 1000000L;
+ private static final float TEST_PLAYBACK_SPEED = 3.0f;
private final Object mWaitLock = new Object();
private Handler mHandler = new Handler(Looper.getMainLooper());
@@ -391,6 +396,40 @@
assertEquals(currentVolume, info.getCurrentVolume());
}
+ @Test
+ @SmallTest
+ public void testGetPlaybackStateWithPositionUpdate() throws InterruptedException {
+ final long stateSetTime = SystemClock.elapsedRealtime();
+ PlaybackStateCompat stateIn = new PlaybackStateCompat.Builder()
+ .setState(PlaybackStateCompat.STATE_PLAYING, TEST_POSITION, TEST_PLAYBACK_SPEED,
+ stateSetTime)
+ .build();
+ mSession.setPlaybackState(stateIn);
+
+ final long waitDuration = 100L;
+ Thread.sleep(waitDuration);
+
+ final long expectedUpdateTime = waitDuration + stateSetTime;
+ final long expectedPosition = (long) (TEST_PLAYBACK_SPEED * waitDuration) + TEST_POSITION;
+
+ final double updateTimeTolerance = 30L;
+ final double positionTolerance = updateTimeTolerance * TEST_PLAYBACK_SPEED;
+
+ PlaybackStateCompat stateOut = mSession.getController().getPlaybackState();
+ assertEquals(expectedUpdateTime, stateOut.getLastPositionUpdateTime(), updateTimeTolerance);
+ assertEquals(expectedPosition, stateOut.getPosition(), positionTolerance);
+
+ // Compare the result with MediaController.getPlaybackState().
+ if (Build.VERSION.SDK_INT >= 21) {
+ MediaController controller = new MediaController(
+ getContext(), (MediaSession.Token) mSession.getSessionToken().getToken());
+ PlaybackState state = controller.getPlaybackState();
+ assertEquals(state.getLastPositionUpdateTime(), stateOut.getLastPositionUpdateTime(),
+ updateTimeTolerance);
+ assertEquals(state.getPosition(), stateOut.getPosition(), positionTolerance);
+ }
+ }
+
private class MediaSessionCallback extends MediaSessionCompat.Callback {
private long mSeekPosition;
private long mQueueItemId;