Data race in initialization of misc files info

Bug: 3480796
Change-Id: I1ff2e7c167872f4e2f11c93981b2dd6ebd0ee897

diff --git a/src/com/android/settings/deviceinfo/Memory.java b/src/com/android/settings/deviceinfo/Memory.java
index 7cb378c..7d2a55e 100644 (file)
--- a/src/com/android/settings/deviceinfo/Memory.java
+++ b/src/com/android/settings/deviceinfo/Memory.java
@@ -326,7 +326,7 @@ public class Memory extends SettingsPreferenceFragment implements OnCancelListen
             return true;
         } else if (preference == mMediaPreferences[Constants.MEDIA_MISC_INDEX]) {
             Context context = getActivity().getApplicationContext();
-            if (MemoryMeasurement.getInstance(context).isSizeOfMiscCategorynonZero()) {
+            if (MemoryMeasurement.getInstance(context).isSizeOfMiscCategoryNonZero()) {
                 startActivity(new Intent(context, MiscFilesHandler.class));
             }
             return true;

diff --git a/src/com/android/settings/deviceinfo/MemoryMeasurement.java b/src/com/android/settings/deviceinfo/MemoryMeasurement.java
index 3f57f21..1b42bc1 100644 (file)
--- a/src/com/android/settings/deviceinfo/MemoryMeasurement.java
+++ b/src/com/android/settings/deviceinfo/MemoryMeasurement.java
@@ -478,8 +478,8 @@ public class MemoryMeasurement {
         mHandler.sendEmptyMessage(MeasurementHandler.MSG_INVALIDATE);
     }
 
-    boolean isSizeOfMiscCategorynonZero() {
-        return mFileInfoForMisc.size() > 0;
+    boolean isSizeOfMiscCategoryNonZero() {
+        return mFileInfoForMisc != null && mFileInfoForMisc.size() > 0;
     }
 
     static class FileInfo implements Comparable<FileInfo> {