Data race in initialization of misc files info

Bug: 3480796
Change-Id: I1ff2e7c167872f4e2f11c93981b2dd6ebd0ee897
This commit is contained in:
Kenny Root
2011-02-24 12:44:01 -08:00
parent 58a6e3ab8c
commit 76c5328935
2 changed files with 3 additions and 3 deletions

View File

@@ -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;

View File

@@ -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> {