PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: c3d76582b6

* commit 'c3d76582b656fdabc92a470ebe0d986b58c44751':
  Add null check in Launcher onNewIntent() before moveToDefaultScreen().
This commit is contained in:
Tony Wickham
2015-10-27 01:06:08 +00:00
committed by android-build-merger
parent 2225ba3046 c3d76582b6
commit 653fa67888
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/Launcher.java
+4 -2
View File
@@ -1893,7 +1893,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);
}
@@ -1932,7 +1932,9 @@ public class Launcher extends Activity
mWorkspace.post(new Runnable() {
@Override
public void run() {
mWorkspace.moveToDefaultScreen(true);
if (mWorkspace != null) {
mWorkspace.moveToDefaultScreen(true);
}
}
});
}