Merge "Add null check in Launcher onNewIntent() before moveToDefaultScreen()." into ub-launcher3-burnaby-polish

2015-10-27 01:02:26 +00:00
parent 1ba7e36cc8 c1739096b4
commit c3d76582b6
1 changed files with 4 additions and 2 deletions
@@ -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);
+                        }
                    }
                });
            }