PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Data race in initialization of misc files info"

Browse Source
This commit is contained in:
Kenny Root
2011-02-24 15:09:52 -08:00
committed by Android (Google) Code Review
parent c3ed121bf9 76c5328935
commit 12edcc2068
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/deviceinfo/Memory.java
View File

@@ -326,7 +326,7 @@ public class Memory extends SettingsPreferenceFragment implements OnCancelListen
return true; return true;
} else if (preference == mMediaPreferences[Constants.MEDIA_MISC_INDEX]) { } else if (preference == mMediaPreferences[Constants.MEDIA_MISC_INDEX]) {
Context context = getActivity().getApplicationContext(); Context context = getActivity().getApplicationContext();
if (MemoryMeasurement.getInstance(context).isSizeOfMiscCategorynonZero()) { if (MemoryMeasurement.getInstance(context).isSizeOfMiscCategoryNonZero()) {
startActivity(new Intent(context, MiscFilesHandler.class)); startActivity(new Intent(context, MiscFilesHandler.class));
} }
return true; return true;

4
src/com/android/settings/deviceinfo/MemoryMeasurement.java
View File

@@ -478,8 +478,8 @@ public class MemoryMeasurement {
mHandler.sendEmptyMessage(MeasurementHandler.MSG_INVALIDATE); mHandler.sendEmptyMessage(MeasurementHandler.MSG_INVALIDATE);
} }
boolean isSizeOfMiscCategorynonZero() { boolean isSizeOfMiscCategoryNonZero() {
return mFileInfoForMisc.size() > 0; return mFileInfoForMisc != null && mFileInfoForMisc.size() > 0;
} }
static class FileInfo implements Comparable<FileInfo> { static class FileInfo implements Comparable<FileInfo> {