PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Settings > Sound crashes if no BT" into rvc-dev

Browse Source
This commit is contained in:
tim peng
2020-05-08 01:55:28 +00:00
committed by Android (Google) Code Review
parent 5625958a20 7fcfac49cf
commit 0b60b3cc9f
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/settings/notification/RemoteVolumeGroupController.java
View File

@@ -23,8 +23,6 @@ import android.text.TextUtils;
import android.util.Log;
import androidx.annotation.VisibleForTesting;
import androidx.lifecycle.LifecycleObserver;
import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.Preference;
import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen;
@@ -32,7 +30,8 @@ import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnDestroy;
import com.android.settingslib.media.LocalMediaManager;
import com.android.settingslib.media.MediaDevice;
import com.android.settingslib.media.MediaOutputSliceConstants;
@@ -46,7 +45,8 @@ import java.util.List;
* {@link com.android.settings.notification.RemoteVolumeSeekBarPreference}
**/
public class RemoteVolumeGroupController extends BasePreferenceController implements
Preference.OnPreferenceChangeListener, LifecycleObserver, LocalMediaManager.DeviceCallback {
Preference.OnPreferenceChangeListener, LifecycleObserver, OnDestroy,
LocalMediaManager.DeviceCallback {
private static final String KEY_REMOTE_VOLUME_GROUP = "remote_media_group";
private static final String TAG = "RemoteVolumePrefCtr";
@@ -93,11 +93,7 @@ public class RemoteVolumeGroupController extends BasePreferenceController implem
}
}
/**
* onDestroy()
* {@link androidx.lifecycle.OnLifecycleEvent}
**/
@OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
@Override
public void onDestroy() {
mLocalMediaManager.unregisterCallback(this);
mLocalMediaManager.stopScan();