commit 76c5328935ab6fb10b283a1de280884bca2a0f33
author Kenny Root <kroot@google.com> Thu Feb 24 12:44:01 2011 -0800
committer Kenny Root <kroot@google.com> Thu Feb 24 12:44:33 2011 -0800
tree 40b5fe3dda4c938b272d1725b41e62e76276e37a
parent 58a6e3ab8c136876a735de9531566fe40eca4dd1

Data race in initialization of misc files info

Bug: 3480796
Change-Id: I1ff2e7c167872f4e2f11c93981b2dd6ebd0ee897

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

diff --git a/src/com/android/settings/deviceinfo/Memory.java b/src/com/android/settings/deviceinfo/Memory.java
index 7cb378c..7d2a55e 100644
--- a/src/com/android/settings/deviceinfo/Memory.java
+++ b/src/com/android/settings/deviceinfo/Memory.java
@@ -326,7 +326,7 @@
             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;

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

diff --git a/src/com/android/settings/deviceinfo/MemoryMeasurement.java b/src/com/android/settings/deviceinfo/MemoryMeasurement.java
index 3f57f21..1b42bc1 100644
--- a/src/com/android/settings/deviceinfo/MemoryMeasurement.java
+++ b/src/com/android/settings/deviceinfo/MemoryMeasurement.java
@@ -478,8 +478,8 @@
         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> {