commit 097bcdcde8e1d416b0d86870d85225a5fa1cca10
author Tadashi G. Takaoka <takaoka@google.com> Tue Oct 21 14:13:27 2014 +0900
committer Tadashi G. Takaoka <takaoka@google.com> Tue Oct 21 14:13:27 2014 +0900
tree 10afd3299d42801da46c31e63c60f09c386c686a
parent 9ba36f29cc8e897720f6654d89118127bf90dc5d

FIx potential NPE

Bug: 18052047
Change-Id: I9097d0a504b8a1d875cf66e44bb65eb6ecc8908e

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);
         }