am 959a7380: am 178c4099: Merge "Handle monkey crash" into mnc-dev

* commit '959a7380f15ea95ccba6d7d6ae30fee8f312bb84':
  Handle monkey crash
This commit is contained in:
Jason Monk
2015-07-20 21:08:04 +00:00
committed by Android Git Automerger
2 changed files with 4 additions and 1 deletions

View File

@@ -71,6 +71,7 @@ public class AppStorageSettings extends AppInfoWithHeader
private static final String KEY_STORAGE_USED = "storage_used";
private static final String KEY_CHANGE_STORAGE = "change_storage_button";
private static final String KEY_STORAGE_SPACE = "storage_space";
private static final String KEY_STORAGE_CATEGORY = "storage_category";
private static final String KEY_TOTAL_SIZE = "total_size";
@@ -182,7 +183,7 @@ public class AppStorageSettings extends AppInfoWithHeader
} else {
showDialogInner(DLG_CLEAR_DATA, 0);
}
} else if (v == mChangeStorageButton) {
} else if (v == mChangeStorageButton && mDialogBuilder != null) {
mDialogBuilder.show();
}
}
@@ -350,6 +351,7 @@ public class AppStorageSettings extends AppInfoWithHeader
} else {
removePreference(KEY_STORAGE_USED);
removePreference(KEY_CHANGE_STORAGE);
removePreference(KEY_STORAGE_SPACE);
}
}