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

am 2105aa3e: Merge "FIx potential NPE" 

* commit '2105aa3ea64ddf9cb0428d2bc717ff6fce12733e':
  FIx potential NPE
main
Tadashi G. Takaoka 2014-10-21 09:19:25 +00:00 committed by Android Git Automerger
parent 2359c54441 2105aa3ea6
commit cfab30306c
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) {
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);
}