| commit | 3ed8b480778db3a2b005c9a1b381b9685d6382e2 | [log] [tgz] |
|---|---|---|
| author | Beverly Tai <beverlyt@google.com> | Mon Oct 15 08:08:22 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Oct 15 08:08:22 2018 -0700 |
| tree | efdcf9eda86ba7fc34fc6210c23ef6b314c607da | |
| parent | a26f5a8ccebf26e995ddfc1e85abada89da8f1a2 [diff] | |
| parent | c59c6ca9a1cbe0e3c92ea08546d6dad89765e461 [diff] |
Merge "Prevent NFE in SystemUI when parsing invalid int" am: 9d7e1fe726 am: c59c6ca9a1 Change-Id: I178f593072e901343b57f2c03f2bd8da20811c9e
diff --git a/packages/SystemUI/src/com/android/systemui/tuner/TunablePadding.java b/packages/SystemUI/src/com/android/systemui/tuner/TunablePadding.java index af99236..e85dee8 100644 --- 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 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;