Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove APIs that are not directly usable."

Browse Source
This commit is contained in:
Treehugger Robot
2016-10-17 21:16:20 +00:00
committed by Gerrit Code Review
parent 78929f3ee0 fb6322425a
commit 9cff57312d
2 changed files with 0 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
core/java/android/bluetooth/BluetoothAvrcpController.java
View File

@@ -65,21 +65,6 @@ public final class BluetoothAvrcpController implements BluetoothProfile {
public static final String ACTION_CONNECTION_STATE_CHANGED =
"android.bluetooth.avrcp-controller.profile.action.CONNECTION_STATE_CHANGED";
/**
* Intent used to broadcast the change in metadata state of playing track on the AVRCP
* AG.
*
* <p>This intent will have the two extras:
* <ul>
* <li> {@link #EXTRA_METADATA} - {@link MediaMetadata} containing the current metadata.</li>
* <li> {@link #EXTRA_PLAYBACK} - {@link PlaybackState} containing the current playback
* state. </li>
* </ul>
*/
public static final String ACTION_TRACK_EVENT =
"android.bluetooth.avrcp-controller.profile.action.TRACK_EVENT";
/**
* Intent used to broadcast the change in player application setting state on AVRCP AG.
*
@@ -92,35 +77,9 @@ public final class BluetoothAvrcpController implements BluetoothProfile {
public static final String ACTION_PLAYER_SETTING =
"android.bluetooth.avrcp-controller.profile.action.PLAYER_SETTING";
public static final String EXTRA_METADATA =
"android.bluetooth.avrcp-controller.profile.extra.METADATA";
public static final String EXTRA_PLAYBACK =
"android.bluetooth.avrcp-controller.profile.extra.PLAYBACK";
public static final String EXTRA_PLAYER_SETTING =
"android.bluetooth.avrcp-controller.profile.extra.PLAYER_SETTING";
/*
* KeyCoded for Pass Through Commands
*/
public static final int PASS_THRU_CMD_ID_PLAY = 0x44;
public static final int PASS_THRU_CMD_ID_PAUSE = 0x46;
public static final int PASS_THRU_CMD_ID_VOL_UP = 0x41;
public static final int PASS_THRU_CMD_ID_VOL_DOWN = 0x42;
public static final int PASS_THRU_CMD_ID_STOP = 0x45;
public static final int PASS_THRU_CMD_ID_FF = 0x49;
public static final int PASS_THRU_CMD_ID_REWIND = 0x48;
public static final int PASS_THRU_CMD_ID_FORWARD = 0x4B;
public static final int PASS_THRU_CMD_ID_BACKWARD = 0x4C;
/* Key State Variables */
public static final int KEY_STATE_PRESSED = 0;
public static final int KEY_STATE_RELEASED = 1;
/* Group Navigation Key Codes */
public static final int PASS_THRU_CMD_ID_NEXT_GRP = 0x00;
public static final int PASS_THRU_CMD_ID_PREV_GRP = 0x01;
private Context mContext;
private ServiceListener mServiceListener;
private IBluetoothAvrcpController mService;
@@ -267,20 +226,6 @@ public final class BluetoothAvrcpController implements BluetoothProfile {
return BluetoothProfile.STATE_DISCONNECTED;
}
public void sendPassThroughCmd(BluetoothDevice device, int keyCode, int keyState) {
if (DBG) Log.d(TAG, "sendPassThroughCmd");
if (mService != null && isEnabled()) {
try {
mService.sendPassThroughCmd(device, keyCode, keyState);
return;
} catch (RemoteException e) {
Log.e(TAG, "Error talking to BT service in sendPassThroughCmd()", e);
return;
}
}
if (mService == null) Log.w(TAG, "Proxy not attached to service");
}
/**
* Gets the player application settings.
*
@@ -300,49 +245,6 @@ public final class BluetoothAvrcpController implements BluetoothProfile {
return settings;
}
/**
* Gets the metadata for the current track.
*
* This should be usually called when application UI needs to be updated, eg. when the track
* changes or immediately after connecting and getting the current state.
* @return the {@link MediaMetadata} or {@link null} if there is an error.
*/
public MediaMetadata getMetadata(BluetoothDevice device) {
if (DBG) Log.d(TAG, "getMetadata");
MediaMetadata metadata = null;
if (mService != null && isEnabled()) {
try {
metadata = mService.getMetadata(device);
} catch (RemoteException e) {
Log.e(TAG, "Error talking to BT service in getMetadata() " + e);
return null;
}
}
return metadata;
}
/**
* Gets the playback state for current track.
*
* When the application is first connecting it can use current track state to get playback info.
* For all further updates it should listen to notifications.
* @return the {@link PlaybackState} or {@link null} if there is an error.
*/
public PlaybackState getPlaybackState(BluetoothDevice device) {
if (DBG) Log.d(TAG, "getPlaybackState");
PlaybackState playbackState = null;
if (mService != null && isEnabled()) {
try {
playbackState = mService.getPlaybackState(device);
} catch (RemoteException e) {
Log.e(TAG,
"Error talking to BT service in getPlaybackState() " + e);
return null;
}
}
return playbackState;
}
/**
* Sets the player app setting for current player.
* returns true in case setting is supported by remote, false otherwise

3
core/java/android/bluetooth/IBluetoothAvrcpController.aidl
View File

@@ -30,10 +30,7 @@ interface IBluetoothAvrcpController {
List<BluetoothDevice> getConnectedDevices();
List<BluetoothDevice> getDevicesMatchingConnectionStates(in int[] states);
int getConnectionState(in BluetoothDevice device);
void sendPassThroughCmd(in BluetoothDevice device, int keyCode, int keyState);
BluetoothAvrcpPlayerSettings getPlayerSettings(in BluetoothDevice device);
MediaMetadata getMetadata(in BluetoothDevice device);
PlaybackState getPlaybackState(in BluetoothDevice device);
boolean setPlayerApplicationSetting(in BluetoothAvrcpPlayerSettings plAppSetting);
void sendGroupNavigationCmd(in BluetoothDevice device, int keyCode, int keyState);
}