commit b9cad485af08919cbbd086f16d1afdbcdfa15a38
author Julia Reynolds <juliacr@google.com> Fri May 13 14:01:40 2016 -0400
committer Julia Reynolds <juliacr@google.com> Fri May 13 14:01:40 2016 -0400
tree c9d75b06aafe36a412c8cf66af73509b7a318954
parent 102b368172b4e8201b32efb686b3f3334e5ddbda

Don't crash on invalid numbers.

Change-Id: I5c1bff5733c5db5f411c2827177b0c1efa1e120e
Fixes: 28756890

src/com/android/settings/display/DensityPreference.java

diff --git a/src/com/android/settings/display/DensityPreference.java b/src/com/android/settings/display/DensityPreference.java
index 44013e3..0c5c187 100644
--- a/src/com/android/settings/display/DensityPreference.java
+++ b/src/com/android/settings/display/DensityPreference.java
@@ -19,6 +19,7 @@
 import android.text.InputType;
 import android.util.AttributeSet;
 import android.util.DisplayMetrics;
+import android.util.Slog;
 import android.view.Display;
 import android.view.View;
 import android.widget.EditText;
@@ -27,6 +28,7 @@
 import com.android.settingslib.display.DisplayDensityUtils;
 
 public class DensityPreference extends CustomEditTextPreference {
+    private static final String TAG = "DensityPreference";
 
     public DensityPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
@@ -62,13 +64,18 @@
     @Override
     protected void onDialogClosed(boolean positiveResult) {
         if (positiveResult) {
-            final Resources res = getContext().getResources();
-            final DisplayMetrics metrics = res.getDisplayMetrics();
-            final int newSwDp = Math.max(Integer.parseInt(getText()), 320);
-            final int minDimensionPx = Math.min(metrics.widthPixels, metrics.heightPixels);
-            final int newDensity = DisplayMetrics.DENSITY_MEDIUM * minDimensionPx / newSwDp;
-            final int densityDpi = Math.max(newDensity, 120);
-            DisplayDensityUtils.setForcedDisplayDensity(Display.DEFAULT_DISPLAY, densityDpi);
+            try {
+                final Resources res = getContext().getResources();
+                final DisplayMetrics metrics = res.getDisplayMetrics();
+                final int newSwDp = Math.max(Integer.parseInt(getText()), 320);
+                final int minDimensionPx = Math.min(metrics.widthPixels, metrics.heightPixels);
+                final int newDensity = DisplayMetrics.DENSITY_MEDIUM * minDimensionPx / newSwDp;
+                final int densityDpi = Math.max(newDensity, 120);
+                DisplayDensityUtils.setForcedDisplayDensity(Display.DEFAULT_DISPLAY, densityDpi);
+            } catch (Exception e) {
+                // TODO: display a message instead of silently failing.
+                Slog.e(TAG, "Couldn't save density", e);
+            }
         }
     }
 }