Merge "Update SlicePreferenceController"

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

@@ -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

src/com/android/settings/slices/SlicePreferenceController.java

@@ -82,6 +82,8 @@ public class SlicePreferenceController extends BasePreferenceController implemen
 
     @Override
     public void onChanged(Slice slice) {
+        if (slice != null) {
             mSlicePreference.onSliceUpdated(slice);
         }
+    }
 }