Merge "mcp: Provide defaults for the missing metadata" (2054eadd) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/mcp/MediaControlProfile.java

+14 −11

Original line number	Original line	Diff line number	Diff line
	@@ -160,24 +160,27 @@ public class MediaControlProfile implements MediaControlServiceCallbacks {
	+ mCurrentData.metadata.duration);		+ mCurrentData.metadata.duration);
	}		}

	if (mCurrentData.metadata.duration != null) {
	state_map.put(PlayerStateField.TRACK_DURATION,		state_map.put(PlayerStateField.TRACK_DURATION,
	Long.valueOf(mCurrentData.metadata.duration));		mCurrentData.metadata.duration != null
	}		? Long.valueOf(mCurrentData.metadata.duration)
			: Long.valueOf(MediaControlGattServiceInterface
			.TRACK_DURATION_UNAVAILABLE));

	if (mCurrentData.metadata.title != null) {		state_map.put(PlayerStateField.TRACK_TITLE,
	state_map.put(PlayerStateField.TRACK_TITLE, mCurrentData.metadata.title);		mCurrentData.metadata.title != null ? mCurrentData.metadata.title : "");
	}

	// Update the position if track has changed		// Update the position if track has changed
	if (mCurrentData.state != null) {
	state_map.put(PlayerStateField.TRACK_POSITION,		state_map.put(PlayerStateField.TRACK_POSITION,
	getDriftCorrectedTrackPosition(mCurrentData.state));		mCurrentData.state != null
	}		? getDriftCorrectedTrackPosition(mCurrentData.state)
			: Long.valueOf(MediaControlGattServiceInterface
			.TRACK_POSITION_UNAVAILABLE));
	} else {		} else {
	state_map.put(PlayerStateField.TRACK_DURATION,		state_map.put(PlayerStateField.TRACK_DURATION,
	Long.valueOf(MediaControlGattServiceInterface.TRACK_DURATION_UNAVAILABLE));		Long.valueOf(MediaControlGattServiceInterface.TRACK_DURATION_UNAVAILABLE));
	state_map.put(PlayerStateField.TRACK_TITLE, "");		state_map.put(PlayerStateField.TRACK_TITLE, "");
			state_map.put(PlayerStateField.TRACK_POSITION,
			Long.valueOf(MediaControlGattServiceInterface.TRACK_POSITION_UNAVAILABLE));
	}		}
	}		}