release-request-ee600ee1-fadc-4a92-9feb-e22548c84a75-for-git_oc-mr1-release-43... (6891a679) · Commits · e / os / android_packages_apps_Bluetooth

src/com/android/bluetooth/avrcp/AddressedMediaPlayer.java

+27 −41

Original line number	Diff line number	Diff line
		@@ -96,12 +96,12 @@ public class AddressedMediaPlayer {
		// NOTE: this is out-of-spec (AVRCP 1.6.1 sec 6.10.4.3, p90) but we answer it anyway
		// because some CTs ask for it.
		if (Arrays.equals(itemAttr.mUid, AvrcpConstants.TRACK_IS_SELECTED)) {
		if (DEBUG) Log.d(TAG, "getItemAttr: Remote requests for now playing contents:");

		// get the current playing metadata and send.
		getItemAttrFilterAttr(bdaddr, itemAttr, getCurrentQueueItem(mediaController, mediaId),
		mediaController);
		return;
		mediaId = getActiveQueueItemId(mediaController);
		if (DEBUG) {
		Log.d(TAG,
		"getItemAttr: Remote requests for now playing contents, sending UID: "
		+ mediaId);
		}
		}

		if (DEBUG) Log.d(TAG, "getItemAttr-UID: 0x" + Utils.byteArrayToString(itemAttr.mUid));
		@@ -125,38 +125,10 @@ public class AddressedMediaPlayer {
		if (items == null) {
		Log.i(TAG, "null queue from " + mediaController.getPackageName()
		+ ", constructing single-item list");
		MediaMetadata metadata = mediaController.getMetadata();

		// Because we are database-unaware, we can just number the item here whatever we want
		// because they have to re-poll it every time.
		MediaSession.QueueItem current = getCurrentQueueItem(mediaController, SINGLE_QID);
		items = new ArrayList<MediaSession.QueueItem>();
		items.add(current);
		}

		if (!items.equals(mNowPlayingList)) sendNowPlayingListChanged();
		mNowPlayingList = items;

		return mNowPlayingList;
		}

		private void sendNowPlayingListChanged() {
		if (mMediaInterface == null) return;
		if (DEBUG) Log.d(TAG, "sendNowPlayingListChanged()");
		mMediaInterface.nowPlayingChangedRsp(AvrcpConstants.NOTIFICATION_TYPE_CHANGED);
		}

		/* Constructs a queue item representing the current playing metadata from an
		* active controller with queue id \|qid\|.
		*/
		private MediaSession.QueueItem getCurrentQueueItem(
		@Nullable MediaController controller, long qid) {
		if (controller == null) {
		MediaDescription.Builder bob = new MediaDescription.Builder();
		bob.setTitle(UNKNOWN_TITLE);
		return new QueueItem(bob.build(), qid);
		}

		MediaMetadata metadata = controller.getMetadata();
		MediaMetadata metadata = mediaController.getMetadata();
		if (metadata == null) {
		Log.w(TAG, "Controller has no metadata!? Making an empty one");
		metadata = (new MediaMetadata.Builder()).build();
		@@ -174,8 +146,22 @@ public class AddressedMediaPlayer {
		bob.setExtras(fillBundle(metadata, desc.getExtras()));

		// build queue item with the new metadata
		desc = bob.build();
		return new QueueItem(desc, qid);
		MediaSession.QueueItem current = new QueueItem(bob.build(), SINGLE_QID);

		items = new ArrayList<MediaSession.QueueItem>();
		items.add(current);
		}

		if (!items.equals(mNowPlayingList)) sendNowPlayingListChanged();
		mNowPlayingList = items;

		return mNowPlayingList;
		}

		private void sendNowPlayingListChanged() {
		if (mMediaInterface == null) return;
		if (DEBUG) Log.d(TAG, "sendNowPlayingListChanged()");
		mMediaInterface.nowPlayingChangedRsp(AvrcpConstants.NOTIFICATION_TYPE_CHANGED);
		}

		private Bundle fillBundle(MediaMetadata metadata, Bundle currentExtras) {

src/com/android/bluetooth/pbap/BluetoothPbapCallLogComposer.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -217,6 +217,7 @@ public class BluetoothPbapCallLogComposer {
		final int callLogType = mCursor.getInt(CALL_TYPE_COLUMN_INDEX);
		final String callLogTypeStr;
		switch (callLogType) {
		case Calls.REJECTED_TYPE:
		case Calls.INCOMING_TYPE: {
		callLogTypeStr = VCARD_PROPERTY_CALLTYPE_INCOMING;
		break;