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

Merge "Use new CarAudioManager.registerCarVolumeCallback API"

Browse Source
This commit is contained in:
Hongwei Wang
2018-12-08 01:35:26 +00:00
committed by Android (Google) Code Review
parent 4292d79e92 efc90dbda6
commit f147fbcfec
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/CarSystemUI/src/com/android/systemui/volume/CarVolumeDialogImpl.java
View File

@@ -26,7 +26,6 @@ import android.app.KeyguardManager;
import android.car.Car;
import android.car.CarNotConnectedException;
import android.car.media.CarAudioManager;
import android.car.media.ICarVolumeCallback;
import android.content.ComponentName;
import android.content.Context;
import android.content.DialogInterface;
@@ -106,7 +105,8 @@ public class CarVolumeDialogImpl implements VolumeDialog {
private ListItemAdapter mPagedListAdapter;
private Car mCar;
private CarAudioManager mCarAudioManager;
private final ICarVolumeCallback mVolumeChangeCallback = new ICarVolumeCallback.Stub() {
private final CarAudioManager.CarVolumeCallback mVolumeChangeCallback =
new CarAudioManager.CarVolumeCallback() {
@Override
public void onGroupVolumeChanged(int zoneId, int groupId, int flags) {
// TODO: Include zoneId into consideration.
@@ -162,7 +162,7 @@ public class CarVolumeDialogImpl implements VolumeDialog {
if (mPagedListAdapter != null) {
mPagedListAdapter.notifyDataSetChanged();
}
mCarAudioManager.registerVolumeCallback(mVolumeChangeCallback.asBinder());
mCarAudioManager.registerCarVolumeCallback(mVolumeChangeCallback);
} catch (CarNotConnectedException e) {
Log.e(TAG, "Car is not connected!", e);
}
@@ -440,11 +440,7 @@ public class CarVolumeDialogImpl implements VolumeDialog {
}
private void cleanupAudioManager() {
try {
mCarAudioManager.unregisterVolumeCallback(mVolumeChangeCallback.asBinder());
} catch (CarNotConnectedException e) {
Log.e(TAG, "Car is not connected!", e);
}
mCarAudioManager.unregisterCarVolumeCallback(mVolumeChangeCallback);
mVolumeLineItems.clear();
mCarAudioManager = null;
}