Merge "Prevent NFE in SystemUI when parsing invalid int"

2018-10-15 13:27:41 +00:00
parent 1ad4aed0b9 9a17312da5
commit 9d7e1fe726
1 changed files with 3 additions and 1 deletions
--- a/packages/SystemUI/src/com/android/systemui/tuner/TunablePadding.java
+++ b/packages/SystemUI/src/com/android/systemui/tuner/TunablePadding.java
@@ -51,7 +51,9 @@ public class TunablePadding implements Tunable {
    public void onTuningChanged(String key, String newValue) {
        int dimen = mDefaultSize;
        if (newValue != null) {
-            dimen = (int) (Integer.parseInt(newValue) * mDensity);
+            try {
+                dimen = (int) (Integer.parseInt(newValue) * mDensity);
+            } catch (NumberFormatException ex) {}
        }
        int left = mView.isLayoutRtl() ? FLAG_END : FLAG_START;
        int right = mView.isLayoutRtl() ? FLAG_START : FLAG_END;