From 76c5328935ab6fb10b283a1de280884bca2a0f33 Mon Sep 17 00:00:00 2001
From: Kenny Root <kroot@google.com>
Date: Thu, 24 Feb 2011 12:44:01 -0800
Subject: [PATCH] Data race in initialization of misc files info

Bug: 3480796
Change-Id: I1ff2e7c167872f4e2f11c93981b2dd6ebd0ee897
---
 src/com/android/settings/deviceinfo/Memory.java            | 2 +-
 src/com/android/settings/deviceinfo/MemoryMeasurement.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/com/android/settings/deviceinfo/Memory.java b/src/com/android/settings/deviceinfo/Memory.java
index 7cb378c5934..7d2a55e2f05 100644
--- 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 3f57f21cb02..1b42bc10df2 100644
--- 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> {