A2dpSink: Remove CoverArt changes to compile SHO code.
CRs-Fixed: 2456855
Change-Id: Ieac1c5c3c9ec93fbafb6b0ddf9c82b84bafba758
diff --git a/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java b/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
index 134d658..5b5306c 100644
--- a/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
+++ b/packages_apps_bluetooth_ext/src/avrcp/Avrcp_ext.java
@@ -2744,7 +2744,7 @@
if (deviceFeatures[i].mCurrentDevice != null) {
Log.d(TAG, "SendPassThruPlay command sent for = "
+ deviceFeatures[i].mCurrentDevice);
- if (volume > mLocalVolume) {
+ /*if (volume > mLocalVolume) {
Log.d(TAG, "Vol Passthrough Up");
avrcpCtrlService.sendPassThroughCmd(
deviceFeatures[i].mCurrentDevice, AVRC_ID_VOL_UP,
@@ -2760,7 +2760,7 @@
avrcpCtrlService.sendPassThroughCmd(
deviceFeatures[i].mCurrentDevice, AVRC_ID_VOL_DOWN,
AvrcpConstants_ext.KEY_STATE_RELEASE);
- }
+ }*/
mLocalVolume = volume;
}
}
diff --git a/packages_apps_bluetooth_ext/src/avrcpcontroller/CoverArtUtils.java b/packages_apps_bluetooth_ext/src/avrcpcontroller/CoverArtUtils.java
index c3eb7f6..a31fd8d 100644
--- a/packages_apps_bluetooth_ext/src/avrcpcontroller/CoverArtUtils.java
+++ b/packages_apps_bluetooth_ext/src/avrcpcontroller/CoverArtUtils.java
@@ -64,14 +64,14 @@
}
private void broadcastInValidHandle(Context ctx, MediaMetadata metadata) {
- Intent intent = new Intent(AvrcpControllerService.ACTION_TRACK_EVENT);
+ /*Intent intent = new Intent(AvrcpControllerService.ACTION_TRACK_EVENT);
intent.putExtra(AvrcpControllerService.EXTRA_METADATA, metadata);
intent.putExtra(EXTRA_METADATA_IS_INVALID_HANDLE, true);
if (DBG) {
Log.d(TAG, " broadcastInValidHandle = " + metadata.getDescription());
}
intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
- ctx.sendBroadcast(intent, ProfileService.BLUETOOTH_PERM);
+ ctx.sendBroadcast(intent, ProfileService.BLUETOOTH_PERM); */
}
public void onElementAttributeUpdate(byte[] address, byte numAttributes, int[] attributes,
@@ -90,13 +90,13 @@
attrList.add(attr);
}
List<String> attrValList = Arrays.asList(attribVals);
- TrackInfo trackInfo = new TrackInfo(attrList, attrValList);
- if (DBG) {
- Log.d(TAG, "onElementAttributeUpdate " + trackInfo);
- }
- Message msg = avrcpCtSm.obtainMessage(
- AvrcpControllerStateMachine.MESSAGE_PROCESS_TRACK_CHANGED, trackInfo);
- avrcpCtSm.sendMessage(msg);
+ //TrackInfo trackInfo = new TrackInfo(attrList, attrValList);
+ //if (DBG) {
+ // Log.d(TAG, "onElementAttributeUpdate " + trackInfo);
+ //}
+ //Message msg = avrcpCtSm.obtainMessage(
+ // AvrcpControllerStateMachine.MESSAGE_PROCESS_TRACK_CHANGED, trackInfo);
+ //avrcpCtSm.sendMessage(msg);
}
public void msgDisconnectBip(AvrcpControllerBipStateMachine bipStateMachine,
@@ -119,7 +119,7 @@
public boolean msgTrackChanged(Context ctx, AvrcpControllerBipStateMachine bipStateMachine,
AvrcpPlayer addressedPlayer, RemoteDevice remoteDevice) {
- boolean isValidHandle = !addressedPlayer.getCurrentTrack().getCoverArtHandle().isEmpty();
+ /*boolean isValidHandle = !addressedPlayer.getCurrentTrack().getCoverArtHandle().isEmpty();
if (bipStateMachine != null && isValidHandle) {
int imageOrThumbnail;
if (AvrcpControllerBipStateMachine.mImageType.equalsIgnoreCase("thumbnail")) {
@@ -127,16 +127,16 @@
} else {
imageOrThumbnail = AvrcpControllerBipStateMachine.MESSAGE_FETCH_IMAGE;
}
- bipStateMachine.sendMessage(imageOrThumbnail,
- addressedPlayer.getCurrentTrack().getCoverArtHandle());
+ //bipStateMachine.sendMessage(imageOrThumbnail,
+ // addressedPlayer.getCurrentTrack().getCoverArtHandle());
}
if (!isValidHandle && remoteDevice != null && remoteDevice.isCoverArtSupported()) {
if (DBG) {
Log.d(TAG, " Cover Art Handle not valid ");
}
- broadcastInValidHandle(ctx, addressedPlayer.getCurrentTrack().getMediaMetaData());
+ //broadcastInValidHandle(ctx, addressedPlayer.getCurrentTrack().getMediaMetaData());
return false;
- }
+ }*/
return true;
}
@@ -147,50 +147,50 @@
}
switch (bipAction) {
case MESSAGE_BIP_CONNECTED:
- if (addressedPlayer.getCurrentTrack().getCoverArtHandle().isEmpty()
- && remoteDevice != null) {
+ //if (addressedPlayer.getCurrentTrack().getCoverArtHandle().isEmpty()
+ // && remoteDevice != null) {
/*
* track changed happened before BIP connection. should fetch cover art handle.
* NumAttributes = 0 and attributes list as null will fetch all attributes
*/
AvrcpControllerService.getElementAttributesNative(
remoteDevice.getBluetoothAddress(), (byte) 0, null);
- }
+ //}
break;
case MESSAGE_BIP_DISCONNECTED:
// clear cover art related info for current track.
- addressedPlayer.getCurrentTrack().clearCoverArtData();
+ //addressedPlayer.getCurrentTrack().clearCoverArtData();
break;
case MESSAGE_BIP_IMAGE_FETCHED:
- boolean imageUpdated = addressedPlayer.getCurrentTrack().updateImageLocation(
+ /*boolean imageUpdated = addressedPlayer.getCurrentTrack().updateImageLocation(
msg.getData().getString(AvrcpControllerBipStateMachine.COVER_ART_HANDLE),
msg.getData()
.getString(AvrcpControllerBipStateMachine.COVER_ART_IMAGE_LOCATION));
if (imageUpdated) {
broadcastMetaDataChanged(ctx,
addressedPlayer.getCurrentTrack().getMediaMetaData());
- }
+ } */
break;
case MESSAGE_BIP_THUMB_NAIL_FETCHED:
- boolean thumbNailUpdated = addressedPlayer.getCurrentTrack().updateThumbNailLocation
+ /*boolean thumbNailUpdated = addressedPlayer.getCurrentTrack().updateThumbNailLocation
(msg.getData().getString(AvrcpControllerBipStateMachine.COVER_ART_HANDLE),
msg.getData()
.getString(AvrcpControllerBipStateMachine.COVER_ART_IMAGE_LOCATION));
if (thumbNailUpdated) {
broadcastMetaDataChanged(ctx,
addressedPlayer.getCurrentTrack().getMediaMetaData());
- }
+ }*/
break;
}
}
private void broadcastMetaDataChanged(Context ctx, MediaMetadata metadata) {
- Intent intent = new Intent(AvrcpControllerService.ACTION_TRACK_EVENT);
+ /*Intent intent = new Intent(AvrcpControllerService.ACTION_TRACK_EVENT);
intent.putExtra(AvrcpControllerService.EXTRA_METADATA, metadata);
if (DBG) {
Log.d(TAG, " broadcastMetaDataChanged = " + metadata.getDescription());
}
- ctx.sendBroadcast(intent, ProfileService.BLUETOOTH_PERM);
+ ctx.sendBroadcast(intent, ProfileService.BLUETOOTH_PERM); */
}
public String dumpMessageString(int message) {