diff options
| author | Tony Wickham <twickham@google.com> | 2015-10-27 01:02:26 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-10-27 01:02:26 +0000 |
| commit | c3d76582b656fdabc92a470ebe0d986b58c44751 (patch) | |
| tree | 7f68d44c1731d793a75c035c959a9db2abccd1f7 | |
| parent | 1ba7e36cc8901b34b91d06fdc868a63f9a8fad2d (diff) | |
| parent | c1739096b44770cd9a3894970f9e86b29043ead9 (diff) | |
| download | android_packages_apps_Trebuchet-c3d76582b656fdabc92a470ebe0d986b58c44751.tar.gz android_packages_apps_Trebuchet-c3d76582b656fdabc92a470ebe0d986b58c44751.tar.bz2 android_packages_apps_Trebuchet-c3d76582b656fdabc92a470ebe0d986b58c44751.zip | |
Merge "Add null check in Launcher onNewIntent() before moveToDefaultScreen()." into ub-launcher3-burnaby-polish
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 969edff0e..d2581414d 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -1921,7 +1921,7 @@ public class Launcher extends Activity final View v = getWindow().peekDecorView(); if (v != null && v.getWindowToken() != null) { - InputMethodManager imm = (InputMethodManager)getSystemService( + InputMethodManager imm = (InputMethodManager) getSystemService( INPUT_METHOD_SERVICE); imm.hideSoftInputFromWindow(v.getWindowToken(), 0); } @@ -1960,7 +1960,9 @@ public class Launcher extends Activity mWorkspace.post(new Runnable() { @Override public void run() { - mWorkspace.moveToDefaultScreen(true); + if (mWorkspace != null) { + mWorkspace.moveToDefaultScreen(true); + } } }); } |