Merge "Update SlicePreferenceController" (d3c02d87) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java

+8 −6

Original line number	Diff line number	Diff line
		@@ -109,12 +109,14 @@ public class BluetoothDeviceDetailsFragment extends RestrictedDashboardFragment
		mCachedDevice = getCachedDevice(mDeviceAddress);
		super.onAttach(context);

		if (FeatureFlagUtils.isEnabled(context, FeatureFlags.SLICE_INJECTION)) {
		final BluetoothFeatureProvider featureProvider = FeatureFactory.getFactory(context)
		.getBluetoothFeatureProvider(context);
		use(BlockingSlicePrefController.class).setSliceUri(
		featureProvider.getBluetoothDeviceSettingsUri(mDeviceAddress));
		}
		final BluetoothFeatureProvider featureProvider = FeatureFactory.getFactory(
		context).getBluetoothFeatureProvider(context);
		final boolean injectionEnabled = FeatureFlagUtils.isEnabled(context,
		FeatureFlags.SLICE_INJECTION);

		use(BlockingSlicePrefController.class).setSliceUri(injectionEnabled
		? featureProvider.getBluetoothDeviceSettingsUri(mDeviceAddress)
		: null);
		}

		@Override

+3 −1

Original line number	Diff line number	Diff line
		@@ -82,6 +82,8 @@ public class SlicePreferenceController extends BasePreferenceController implemen

		@Override
		public void onChanged(Slice slice) {
		if (slice != null) {
		mSlicePreference.onSliceUpdated(slice);
		}
		}
		}