Snap for 7731944 from 7b005bcf2fd3ead70713eb7a7ae4f5360e2acaef to sc-v2-release (f047d060) · Commits · e / os / android_packages_apps_Bluetooth

src/com/android/bluetooth/audio_util/BrowsedPlayerWrapper.java

+6 −1

Original line number	Diff line number	Diff line
		@@ -429,7 +429,12 @@ class BrowsedPlayerWrapper {
		Folder f = new Folder(item.getMediaId(), false, title);
		return_list.add(new ListItem(f));
		} else {
		return_list.add(new ListItem(Util.toMetadata(mContext, item)));
		Metadata data = Util.toMetadata(mContext, item);
		if (Util.isEmptyData(data)) {
		Log.e(TAG, "Received empty Metadata, ignoring browsed item");
		continue;
		}
		return_list.add(new ListItem(data));
		}
		}

src/com/android/bluetooth/audio_util/helpers/Util.java

+49 −18

Original line number	Diff line number	Diff line
		@@ -43,17 +43,16 @@ class Util {
		* Get an empty set of Metadata
		*/
		public static final Metadata empty_data() {
		Metadata ret = new Metadata();
		ret.mediaId = "Not Provided";
		ret.title = "Not Provided";
		ret.artist = "";
		ret.album = "";
		ret.genre = "";
		ret.trackNum = "1";
		ret.numTracks = "1";
		ret.duration = "0";
		ret.image = null;
		return ret;
		Metadata.Builder builder = new Metadata.Builder();
		return builder.useDefaults().build();
		}

		/**
		* Determine if a set of Metadata is "empty" as defined by audio_util.
		*/
		public static final boolean isEmptyData(Metadata data) {
		if (data == null) return true;
		return (empty_data().equals(data) && data.mediaId.equals("Not Provided"));
		}

		/**
		@@ -71,7 +70,12 @@ class Util {
		*/
		public static Metadata toMetadata(Context context, Bundle bundle) {
		Metadata.Builder builder = new Metadata.Builder();
		try {
		return builder.useContext(context).useDefaults().fromBundle(bundle).build();
		} catch (Exception e) {
		Log.e(TAG, "Failed to build Metadata from Bundle, returning empty data", e);
		return empty_data();
		}
		}

		/**
		@@ -86,8 +90,13 @@ class Util {
		}

		Metadata.Builder builder = new Metadata.Builder();
		try {
		return builder.useContext(context).useDefaults().fromMediaDescription(desc)
		.fromMediaMetadata(data).build();
		} catch (Exception e) {
		Log.e(TAG, "Failed to build Metadata from MediaDescription, returning empty data", e);
		return empty_data();
		}
		}

		/**
		@@ -95,14 +104,27 @@ class Util {
		*/
		public static Metadata toMetadata(Context context, MediaItem item) {
		Metadata.Builder builder = new Metadata.Builder();
		try {
		return builder.useContext(context).useDefaults().fromMediaItem(item).build();
		} catch (Exception e) {
		Log.e(TAG, "Failed to build Metadata from MediaItem, returning empty data", e);
		return empty_data();
		}
		}

		/**
		* Translate a MediaSession.QueueItem to audio_util's Metadata
		*/
		public static Metadata toMetadata(Context context, MediaSession.QueueItem item) {
		Metadata.Builder builder = new Metadata.Builder().useDefaults().fromQueueItem(item);
		Metadata.Builder builder = new Metadata.Builder();

		try {
		builder.useDefaults().fromQueueItem(item);
		} catch (Exception e) {
		Log.e(TAG, "Failed to build Metadata from QueueItem, returning empty data", e);
		return empty_data();
		}

		// For Queue Items, the Media Id will always be just its Queue ID
		// We don't need to use its actual ID since we don't promise UIDS being valid
		// between a file system and it's now playing list.
		@@ -118,8 +140,13 @@ class Util {
		// This will always be currsong. The AVRCP service will overwrite the mediaId if it needs to
		// TODO (apanicke): Remove when the service is ready, right now it makes debugging much more
		// convenient
		try {
		return builder.useContext(context).useDefaults().fromMediaMetadata(data)
		.setMediaId("currsong").build();
		} catch (Exception e) {
		Log.e(TAG, "Failed to build Metadata from MediaMetadata, returning empty data", e);
		return empty_data();
		}
		}

		/**
		@@ -133,6 +160,10 @@ class Util {

		for (int i = 0; i < items.size(); i++) {
		Metadata data = toMetadata(context, items.get(i));
		if (isEmptyData(data)) {
		Log.e(TAG, "Received an empty Metadata item in list. Returning an empty queue");
		return new ArrayList<Metadata>();
		}
		data.trackNum = "" + (i + 1);
		data.numTracks = "" + items.size();
		list.add(data);

src/com/android/bluetooth/telephony/BluetoothInCallService.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -189,6 +189,10 @@ public class BluetoothInCallService extends InCallService {
		if (call.isExternalCall()) {
		return;
		}
		if (state == Call.STATE_DISCONNECTING) {
		mLastState = state;
		return;
		}

		// If a BluetoothCall is being put on hold because of a new connecting call, ignore the
		// CONNECTING since the BT state update needs to send out the numHeld = 1 + dialing