Update SlicePreferenceController
Make sure setSliceUri is invoked even when it is null, where we create SliceLiveData. Then in lifecycle, if LiveData is not null, we will register observer. Bug: 120803703 Test: Manual Change-Id: I56caf2abf04c4a251ebafa5deb599d44b1c7fe92
This commit is contained in:
@@ -109,12 +109,14 @@ public class BluetoothDeviceDetailsFragment extends RestrictedDashboardFragment
|
|||||||
mCachedDevice = getCachedDevice(mDeviceAddress);
|
mCachedDevice = getCachedDevice(mDeviceAddress);
|
||||||
super.onAttach(context);
|
super.onAttach(context);
|
||||||
|
|
||||||
if (FeatureFlagUtils.isEnabled(context, FeatureFlags.SLICE_INJECTION)) {
|
final BluetoothFeatureProvider featureProvider = FeatureFactory.getFactory(
|
||||||
final BluetoothFeatureProvider featureProvider = FeatureFactory.getFactory(context)
|
context).getBluetoothFeatureProvider(context);
|
||||||
.getBluetoothFeatureProvider(context);
|
final boolean injectionEnabled = FeatureFlagUtils.isEnabled(context,
|
||||||
use(BlockingSlicePrefController.class).setSliceUri(
|
FeatureFlags.SLICE_INJECTION);
|
||||||
featureProvider.getBluetoothDeviceSettingsUri(mDeviceAddress));
|
|
||||||
}
|
use(BlockingSlicePrefController.class).setSliceUri(injectionEnabled
|
||||||
|
? featureProvider.getBluetoothDeviceSettingsUri(mDeviceAddress)
|
||||||
|
: null);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@@ -82,6 +82,8 @@ public class SlicePreferenceController extends BasePreferenceController implemen
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onChanged(Slice slice) {
|
public void onChanged(Slice slice) {
|
||||||
|
if (slice != null) {
|
||||||
mSlicePreference.onSliceUpdated(slice);
|
mSlicePreference.onSliceUpdated(slice);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
Reference in New Issue
Block a user