diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-10-21 09:19:25 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-10-21 09:19:25 +0000 |
| commit | cfab30306cf781233254915fd4ebd9266ec2bb6e (patch) | |
| tree | 50f2f044522070292ddf70b35de45378b80cdd1f /java/src | |
| parent | 2359c54441d7c389a521d0755845e587fb0b4401 (diff) | |
| parent | 2105aa3ea64ddf9cb0428d2bc717ff6fce12733e (diff) | |
| download | latinime-cfab30306cf781233254915fd4ebd9266ec2bb6e.tar.gz latinime-cfab30306cf781233254915fd4ebd9266ec2bb6e.tar.xz latinime-cfab30306cf781233254915fd4ebd9266ec2bb6e.zip | |
am 2105aa3e: Merge "FIx potential NPE"
* commit '2105aa3ea64ddf9cb0428d2bc717ff6fce12733e':
FIx potential NPE
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/utils/ViewLayoutUtils.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/utils/ViewLayoutUtils.java b/java/src/com/android/inputmethod/latin/utils/ViewLayoutUtils.java index dd122b634..0bcba2754 100644 --- a/java/src/com/android/inputmethod/latin/utils/ViewLayoutUtils.java +++ b/java/src/com/android/inputmethod/latin/utils/ViewLayoutUtils.java @@ -57,7 +57,7 @@ public final class ViewLayoutUtils { public static void updateLayoutHeightOf(final Window window, final int layoutHeight) { final WindowManager.LayoutParams params = window.getAttributes(); - if (params.height != layoutHeight) { + if (params != null && params.height != layoutHeight) { params.height = layoutHeight; window.setAttributes(params); } @@ -65,7 +65,7 @@ public final class ViewLayoutUtils { public static void updateLayoutHeightOf(final View view, final int layoutHeight) { final ViewGroup.LayoutParams params = view.getLayoutParams(); - if (params.height != layoutHeight) { + if (params != null && params.height != layoutHeight) { params.height = layoutHeight; view.setLayoutParams(params); } |