Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Make PlaybackState immutable with a builder"

Browse Source 
Will resubmit tomorrow for Build Breakage Friday as this change needs new SDK prebuilts for unbundled app branches.

This reverts commit aa746b27610680a2c0fbdf7d81a6455c4597f05e.

Change-Id: I28ba7e1b09234a5eb1b725aed043b9de98e1bc16
This commit is contained in:
Erik Pasternak
2014-07-10 22:51:34 +00:00
parent 5a4e011143
commit b2e93efcac
7 changed files with 157 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
media/java/android/media/RemoteControlClient.java
View File

@@ -682,13 +682,9 @@ public class RemoteControlClient
// USE_SESSIONS
if (mSession != null) {
int pbState = PlaybackState.getStateFromRccState(state);
long position = hasPosition ? mPlaybackPositionMs
: PlaybackState.PLAYBACK_POSITION_UNKNOWN;
PlaybackState.Builder bob = new PlaybackState.Builder(mSessionPlaybackState);
bob.setState(pbState, position, playbackSpeed, SystemClock.elapsedRealtime());
bob.setErrorMessage(null);
mSessionPlaybackState = bob.build();
mSessionPlaybackState.setState(pbState, hasPosition ?
mPlaybackPositionMs : PlaybackState.PLAYBACK_POSITION_UNKNOWN,
playbackSpeed);
mSession.setPlaybackState(mSessionPlaybackState);
}
}
@@ -749,9 +745,8 @@ public class RemoteControlClient
// USE_SESSIONS
if (mSession != null) {
PlaybackState.Builder bob = new PlaybackState.Builder(mSessionPlaybackState);
bob.setActions(PlaybackState.getActionsFromRccControlFlags(transportControlFlags));
mSessionPlaybackState = bob.build();
mSessionPlaybackState.setActions(PlaybackState
.getActionsFromRccControlFlags(transportControlFlags));
mSession.setPlaybackState(mSessionPlaybackState);
}
}
@@ -951,7 +946,7 @@ public class RemoteControlClient
/**
* Cache for the current playback state using Session APIs.
*/
private PlaybackState mSessionPlaybackState = null;
private final PlaybackState mSessionPlaybackState = new PlaybackState();
/**
* Cache for metadata using Session APIs. This is re-initialized in apply().