Merge "Guard against crash in SummaryProvider" into nyc-dev

am: 3095c77

* commit '3095c77d5b28839ff6e757d6c08afd1bd2cd7afa':
  Guard against crash in SummaryProvider

Change-Id: I759042100f3b4f21b9056d83b817634f066fae93

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();
             }