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 am: 0b60b3cc9f am: 20f3e0bf29 am: 9a924b03ca

Browse Source 
Change-Id: I6923505b7a618e76ed96b9a28c1029688eb6350d
This commit is contained in:
tim peng
2020-05-08 02:48:08 +00:00
committed by Automerger Merge Worker
parent a30f1a7418 9a924b03ca
commit 4a8ed87e94
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 android.util.Log;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
import androidx.lifecycle.LifecycleObserver;
import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.Preference; import androidx.preference.Preference;
import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceScreen;
@@ -32,7 +30,8 @@ import androidx.preference.PreferenceScreen;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.Utils; import com.android.settings.Utils;
import com.android.settings.core.BasePreferenceController; 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.LocalMediaManager;
import com.android.settingslib.media.MediaDevice; import com.android.settingslib.media.MediaDevice;
import com.android.settingslib.media.MediaOutputSliceConstants; import com.android.settingslib.media.MediaOutputSliceConstants;
@@ -46,7 +45,8 @@ import java.util.List;
* {@link com.android.settings.notification.RemoteVolumeSeekBarPreference} * {@link com.android.settings.notification.RemoteVolumeSeekBarPreference}
**/ **/
public class RemoteVolumeGroupController extends BasePreferenceController implements 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 KEY_REMOTE_VOLUME_GROUP = "remote_media_group";
private static final String TAG = "RemoteVolumePrefCtr"; private static final String TAG = "RemoteVolumePrefCtr";
@@ -93,11 +93,7 @@ public class RemoteVolumeGroupController extends BasePreferenceController implem
} }
} }
/** @Override
* onDestroy()
* {@link androidx.lifecycle.OnLifecycleEvent}
**/
@OnLifecycleEvent(Lifecycle.Event.ON_DESTROY)
public void onDestroy() { public void onDestroy() {
mLocalMediaManager.unregisterCallback(this); mLocalMediaManager.unregisterCallback(this);
mLocalMediaManager.stopScan(); mLocalMediaManager.stopScan();

1
src/com/android/settings/notification/SoundSettings.java
View File

@@ -195,7 +195,6 @@ public class SoundSettings extends DashboardFragment implements OnActivityResult
controller.setCallback(mVolumeCallback); controller.setCallback(mVolumeCallback);
getSettingsLifecycle().addObserver(controller); getSettingsLifecycle().addObserver(controller);
} }
getSettingsLifecycle().addObserver(use(RemoteVolumeGroupController.class));
} }
// === Volumes === // === Volumes ===