DO NOT MERGE: Revert "AVRCP Controller AbsoluteVolumeNotification"
This revert is reapplied after a few CLs to match change order to AOSP.
This reverts commit fc9aee6d0bb93f8947f8c50e66ff7ba0e6f7a662.
Bug: 129478624
Change-Id: I4bfdaa1717df89492bd74a1c59ad151d2161d0ab
diff --git a/src/com/android/bluetooth/avrcpcontroller/AvrcpControllerStateMachine.java b/src/com/android/bluetooth/avrcpcontroller/AvrcpControllerStateMachine.java
index 66571c4..1d1a635 100644
--- a/src/com/android/bluetooth/avrcpcontroller/AvrcpControllerStateMachine.java
+++ b/src/com/android/bluetooth/avrcpcontroller/AvrcpControllerStateMachine.java
@@ -89,14 +89,7 @@
*/
private static final int ABS_VOL_BASE = 127;
- /*
- * Notification types for Avrcp protocol JNI.
- */
- private static final byte NOTIFICATION_RSP_TYPE_INTERIM = 0x00;
- private static final byte NOTIFICATION_RSP_TYPE_CHANGED = 0x01;
-
private final AudioManager mAudioManager;
- private final boolean mIsVolumeFixed;
protected final BluetoothDevice mDevice;
protected final byte[] mDeviceAddress;
@@ -115,7 +108,6 @@
private int mAddressedPlayerId = -1;
private SparseArray<AvrcpPlayer> mAvailablePlayerList = new SparseArray<AvrcpPlayer>();
private int mVolumeChangedNotificationsToIgnore = 0;
- private int mVolumeNotificationLabel = -1;
GetFolderList mGetFolderList = null;
@@ -145,7 +137,6 @@
mGetFolderList = new GetFolderList();
addState(mGetFolderList, mConnected);
mAudioManager = (AudioManager) service.getSystemService(Context.AUDIO_SERVICE);
- mIsVolumeFixed = mAudioManager.isVolumeFixed();
setInitialState(mDisconnected);
}
@@ -318,13 +309,6 @@
setAbsVolume(msg.arg1, msg.arg2);
return true;
- case MESSAGE_PROCESS_REGISTER_ABS_VOL_NOTIFICATION:
- mVolumeNotificationLabel = msg.arg1;
- mService.sendRegisterAbsVolRspNative(mDeviceAddress,
- NOTIFICATION_RSP_TYPE_INTERIM,
- getAbsVolumeResponse(), mVolumeNotificationLabel);
- return true;
-
case MESSAGE_GET_FOLDER_ITEMS:
transitionTo(mGetFolderList);
return true;
@@ -564,9 +548,24 @@
}
break;
- default:
+ case CONNECT:
+ case DISCONNECT:
+ case MSG_AVRCP_PASSTHRU:
+ case MESSAGE_PROCESS_SET_ABS_VOL_CMD:
+ case MESSAGE_PROCESS_REGISTER_ABS_VOL_NOTIFICATION:
+ case MESSAGE_PROCESS_TRACK_CHANGED:
+ case MESSAGE_PROCESS_PLAY_POS_CHANGED:
+ case MESSAGE_PROCESS_PLAY_STATUS_CHANGED:
+ case MESSAGE_PROCESS_VOLUME_CHANGED_NOTIFICATION:
+ case MESSAGE_PLAY_ITEM:
+ case MESSAGE_PROCESS_ADDRESSED_PLAYER_CHANGED:
// All of these messages should be handled by parent state immediately.
return false;
+
+ default:
+ logD(STATE_TAG + " deferring message " + msg.what
+ + " to connected!");
+ deferMessage(msg);
}
return true;
}
@@ -695,17 +694,7 @@
mAudioManager.setStreamVolume(AudioManager.STREAM_MUSIC, newIndex,
AudioManager.FLAG_SHOW_UI);
}
- mService.sendAbsVolRspNative(mDeviceAddress, getAbsVolumeResponse(), label);
- }
-
- private int getAbsVolumeResponse() {
- if (mIsVolumeFixed) {
- return ABS_VOL_BASE;
- }
- int maxVolume = mAudioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC);
- int currIndex = mAudioManager.getStreamVolume(AudioManager.STREAM_MUSIC);
- int newIndex = (currIndex * ABS_VOL_BASE) / maxVolume;
- return newIndex;
+ mService.sendAbsVolRspNative(mDeviceAddress, absVol, label);
}
MediaSession.Callback mSessionCallbacks = new MediaSession.Callback() {
diff --git a/tests/unit/src/com/android/bluetooth/avrcpcontroller/AvrcpControllerStateMachineTest.java b/tests/unit/src/com/android/bluetooth/avrcpcontroller/AvrcpControllerStateMachineTest.java
index 4fedc88..b1d1743 100644
--- a/tests/unit/src/com/android/bluetooth/avrcpcontroller/AvrcpControllerStateMachineTest.java
+++ b/tests/unit/src/com/android/bluetooth/avrcpcontroller/AvrcpControllerStateMachineTest.java
@@ -23,7 +23,6 @@
import android.bluetooth.BluetoothProfile;
import android.content.Context;
import android.content.Intent;
-import android.media.AudioManager;
import android.media.session.MediaController;
import android.os.Looper;
@@ -71,8 +70,6 @@
@Mock
private AdapterService mAdapterService;
@Mock
- private AudioManager mAudioManager;
- @Mock
private AvrcpControllerService mAvrcpControllerService;
AvrcpControllerStateMachine mAvrcpStateMachine;
@@ -93,11 +90,6 @@
TestUtils.setAdapterService(mAdapterService);
TestUtils.startService(mServiceRule, AvrcpControllerService.class);
doReturn(mTargetContext.getResources()).when(mAvrcpControllerService).getResources();
- doReturn(15).when(mAudioManager).getStreamMaxVolume(anyInt());
- doReturn(8).when(mAudioManager).getStreamVolume(anyInt());
- doReturn(true).when(mAudioManager).isVolumeFixed();
- doReturn(mAudioManager).when(mAvrcpControllerService)
- .getSystemService(Context.AUDIO_SERVICE);
// This line must be called to make sure relevant objects are initialized properly
mAdapter = BluetoothAdapter.getDefaultAdapter();
@@ -495,18 +487,6 @@
}
/**
- * Test that Absolute Volume Registration is working
- */
- @Test
- public void testRegisterAbsVolumeNotification() {
- setUpConnectedState(true, true);
- mAvrcpStateMachine.sendMessage(
- AvrcpControllerStateMachine.MESSAGE_PROCESS_REGISTER_ABS_VOL_NOTIFICATION);
- verify(mAvrcpControllerService, timeout(ASYNC_CALL_TIMEOUT_MILLIS).times(1))
- .sendRegisterAbsVolRspNative(any(), anyByte(), eq(127), anyInt());
- }
-
- /**
* Setup Connected State
*
* @return number of times mAvrcpControllerService.sendBroadcastAsUser() has been invoked