diff options
| author | Daniel Nishi <dhnishi@google.com> | 2016-09-23 19:17:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-09-23 19:17:55 +0000 |
| commit | 4d484fe5d3d445d464bc22081994d382f0925655 (patch) | |
| tree | c5a5dd5897f85876c39cf7131c5e2b58bb689a0a | |
| parent | 6285605d7d3a918bfe75ec19a46a1329331b8013 (diff) | |
| parent | dbf58432eba75178987aa239d739947c1ab36f45 (diff) | |
| download | StorageManager-4d484fe5d3d445d464bc22081994d382f0925655.tar.gz | |
Merge "Fix a bug where Deletion Helper could crash on deletion size callback." into nyc-mr1-dev
| -rw-r--r-- | src/com/android/storagemanager/deletionhelper/DeletionHelperSettings.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/com/android/storagemanager/deletionhelper/DeletionHelperSettings.java b/src/com/android/storagemanager/deletionhelper/DeletionHelperSettings.java index d507320..23ca719 100644 --- a/src/com/android/storagemanager/deletionhelper/DeletionHelperSettings.java +++ b/src/com/android/storagemanager/deletionhelper/DeletionHelperSettings.java @@ -231,8 +231,12 @@ public class DeletionHelperSettings extends PreferenceFragment implements } private void updateFreeButtonText() { - mFree.setText(String.format(getActivity().getString(R.string.deletion_helper_free_button), - Formatter.formatFileSize(getActivity(), getTotalFreeableSpace()))); + Activity activity = getActivity(); + if (activity == null) { + return; + } + mFree.setText(String.format(activity.getString(R.string.deletion_helper_free_button), + Formatter.formatFileSize(activity, getTotalFreeableSpace()))); } private long getTotalFreeableSpace() { |