diff options
| author | Joey <joey@lineageos.org> | 2018-01-14 10:58:05 +0100 |
|---|---|---|
| committer | Arne Coucheron <arco68@gmail.com> | 2018-01-19 00:27:14 +0100 |
| commit | 70db1218352ea13dbed8e9bab931882dc83abec4 (patch) | |
| tree | 5a0ecbadfec91b9e729be249a2b319c9fc5ed13f | |
| parent | 8dee56deeed7b09a9e5e9f4d21f27aa9d495930c (diff) | |
| download | android_packages_apps_Trebuchet-70db1218352ea13dbed8e9bab931882dc83abec4.tar.gz android_packages_apps_Trebuchet-70db1218352ea13dbed8e9bab931882dc83abec4.tar.bz2 android_packages_apps_Trebuchet-70db1218352ea13dbed8e9bab931882dc83abec4.zip | |
Trebuchet: prevent NPE when opening settings the first time
E AndroidRuntime: java.lang.RuntimeException: Unable to start activity
ComponentInfo{org.lineageos.trebuchet/com.android.launcher3.SettingsActivity}:
java.lang.NullPointerException: Attempt to invoke virtual method
'void com.google.android.libraries.launcherclient.LauncherClient.onDestroy()'
on a null object reference
Change-Id: I161c7888932d32cdc6d9f11d4f140ca635dab72d
Signed-off-by: Joey <joey@lineageos.org>
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 95b1f0f93..b53560d94 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -4201,6 +4201,11 @@ public class Launcher extends BaseActivity mFeedIntegrationEnabled = isFeedIntegrationEnabled(); mLauncherTab.updateLauncherTab(mFeedIntegrationEnabled); + + if (mLauncherTab.getClient() == null) { + return; + } + if (mFeedIntegrationEnabled) { mLauncherTab.getClient().onAttachedToWindow(); } else { |