Merge "Guard against crash in SummaryProvider" into nyc-dev am: 3095c77

am: 4fbb0e3

* commit '4fbb0e35e8a44b23b4f9a95ccdfb5e094c663f5c':
  Guard against crash in SummaryProvider

Change-Id: I8223bac4b7d8cf17f4cd4a47c479c2c2b95160e7

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

@@ -478,6 +478,9 @@ public class StorageSettings extends SettingsPreferenceFragment implements Index
                     continue;
                 }
                 final File path = info.getPath();
+                if (path == null) {
+                    continue;
+                }
                 privateUsedBytes += path.getTotalSpace() - path.getFreeSpace();
                 privateTotalBytes += path.getTotalSpace();
             }