nyancrimew/LatinIME
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "FIx potential NPE"

Browse source
This commit is contained in:
Tadashi G. Takaoka 2014-10-21 08:14:44 +00:00 committed by Android (Google) Code Review
commit 2105aa3ea6
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
java/src/com/android/inputmethod/latin/utils/ViewLayoutUtils.java
View file

@ -57,7 +57,7 @@ public final class ViewLayoutUtils {
public static void updateLayoutHeightOf(final Window window, final int layoutHeight) { public static void updateLayoutHeightOf(final Window window, final int layoutHeight) {
final WindowManager.LayoutParams params = window.getAttributes(); final WindowManager.LayoutParams params = window.getAttributes();
if (params.height != layoutHeight) { if (params != null && params.height != layoutHeight) {
params.height = layoutHeight; params.height = layoutHeight;
window.setAttributes(params); window.setAttributes(params);
} }
@ -65,7 +65,7 @@ public final class ViewLayoutUtils {
public static void updateLayoutHeightOf(final View view, final int layoutHeight) { public static void updateLayoutHeightOf(final View view, final int layoutHeight) {
final ViewGroup.LayoutParams params = view.getLayoutParams(); final ViewGroup.LayoutParams params = view.getLayoutParams();
if (params.height != layoutHeight) { if (params != null && params.height != layoutHeight) {
params.height = layoutHeight; params.height = layoutHeight;
view.setLayoutParams(params); view.setLayoutParams(params);
} }