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

Merge "Remove unused BluetoothHearingAid APIs and usages" am: 7d48a4513c am: ed567b8cad

Browse Source 
Change-Id: I75d0d1436fb361152327a6e968d6fb5b5655d9eb
This commit is contained in:
Automerger Merge Worker
2020-01-02 21:17:42 +00:00
parent e977504e7a ed567b8cad
commit 588696bef3
2 changed files with 0 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
core/java/android/bluetooth/BluetoothHearingAid.java
View File

@@ -471,63 +471,6 @@ public final class BluetoothHearingAid implements BluetoothProfile {
}
}
/**
* Get the volume of the device.
*
* <p> The volume is between -128 dB (mute) to 0 dB.
*
* @return volume of the hearing aid device.
* @hide
*/
@RequiresPermission(Manifest.permission.BLUETOOTH)
public int getVolume() {
if (VDBG) {
log("getVolume()");
}
final IBluetoothHearingAid service = getService();
try {
if (service != null && isEnabled()) {
return service.getVolume();
}
if (service == null) Log.w(TAG, "Proxy not attached to service");
return 0;
} catch (RemoteException e) {
Log.e(TAG, "Stack:" + Log.getStackTraceString(new Throwable()));
return 0;
}
}
/**
* Tells remote device to adjust volume. Uses the following values:
* <ul>
* <li>{@link AudioManager#ADJUST_LOWER}</li>
* <li>{@link AudioManager#ADJUST_RAISE}</li>
* <li>{@link AudioManager#ADJUST_MUTE}</li>
* <li>{@link AudioManager#ADJUST_UNMUTE}</li>
* </ul>
*
* @param direction One of the supported adjust values.
* @hide
*/
@RequiresPermission(Manifest.permission.BLUETOOTH)
public void adjustVolume(int direction) {
if (DBG) log("adjustVolume(" + direction + ")");
final IBluetoothHearingAid service = getService();
try {
if (service == null) {
Log.w(TAG, "Proxy not attached to service");
return;
}
if (!isEnabled()) return;
service.adjustVolume(direction);
} catch (RemoteException e) {
Log.e(TAG, "Stack:" + Log.getStackTraceString(new Throwable()));
}
}
/**
* Tells remote device to set an absolute volume.
*

21
packages/SettingsLib/src/com/android/settingslib/bluetooth/HearingAidProfile.java
View File

@@ -203,13 +203,6 @@ public class HearingAidProfile implements LocalBluetoothProfile {
}
}
public int getVolume() {
if (mService == null) {
return 0;
}
return mService.getVolume();
}
public void setVolume(int volume) {
if (mService == null) {
return;
@@ -224,20 +217,6 @@ public class HearingAidProfile implements LocalBluetoothProfile {
return mService.getHiSyncId(device);
}
public int getDeviceSide(BluetoothDevice device) {
if (mService == null) {
return BluetoothHearingAid.SIDE_LEFT;
}
return mService.getDeviceSide(device);
}
public int getDeviceMode(BluetoothDevice device) {
if (mService == null) {
return BluetoothHearingAid.MODE_MONAURAL;
}
return mService.getDeviceMode(device);
}
public String toString() {
return NAME;
}