Merge "Gracefully handle null volumes after forgetting." into oc-dev am: d6d6185167

am: 8f68658aef

Change-Id: I1033e51c837c9ed51e424435e8b49cac7eca51dc

src/com/android/settings/deviceinfo/PrivateVolumeForget.java

@@ -53,8 +53,18 @@ public class PrivateVolumeForget extends SettingsPreferenceFragment {
             Bundle savedInstanceState) {
         final StorageManager storage = getActivity().getSystemService(StorageManager.class);
         final String fsUuid = getArguments().getString(VolumeRecord.EXTRA_FS_UUID);
+        // Passing null will crash the StorageManager, so let's early exit.
+        if (fsUuid == null) {
+            getActivity().finish();
+            return null;
+        }
         mRecord = storage.findRecordByUuid(fsUuid);
 
+        if (mRecord == null) {
+            getActivity().finish();
+            return null;
+        }
+
         final View view = inflater.inflate(R.layout.storage_internal_forget, container, false);
         final TextView body = (TextView) view.findViewById(R.id.body);
         final Button confirm = (Button) view.findViewById(R.id.confirm);