commit 2105aa3ea64ddf9cb0428d2bc717ff6fce12733e
author Tadashi G. Takaoka <takaoka@google.com> Tue Oct 21 08:14:44 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 21 08:14:46 2014 +0000
tree 701091f9821e4c1e78fe80731312fb4df2a9f190
parent fa1e65cb3a5dcce6299a6dd067cee95720107307
parent 097bcdcde8e1d416b0d86870d85225a5fa1cca10

Merge "FIx potential NPE"

java/src/com/android/inputmethod/latin/utils/ViewLayoutUtils.java

diff --git a/java/src/com/android/inputmethod/latin/utils/ViewLayoutUtils.java b/java/src/com/android/inputmethod/latin/utils/ViewLayoutUtils.java
index dd122b6..0bcba27 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 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 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);
         }