commit 20f2365343e734e81b98f00068d44089e34ae7cd
author Sunny Goyal <sunnygoyal@google.com> Tue May 03 02:13:58 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue May 03 02:13:58 2016 +0000
tree d899aa5f90fc7a6f89ccb540c545ded4134e3497
parent dd221132d52fb484e35d47a831f399529e117cf0
parent 5ae82081c15c957d92a7eff68473d1c45d3c5e8f

Fixing crash when getActivity is null
am: 5ae82081c1

* commit '5ae82081c15c957d92a7eff68473d1c45d3c5e8f':
  Fixing crash when getActivity is null

Change-Id: Iaa77d68c200fed8ad99c2b385f2866d2a7dcc339

src/com/android/launcher3/SettingsActivity.java

diff --git a/src/com/android/launcher3/SettingsActivity.java b/src/com/android/launcher3/SettingsActivity.java
index 5d9a546..4135d5b 100644
--- a/src/com/android/launcher3/SettingsActivity.java
+++ b/src/com/android/launcher3/SettingsActivity.java
@@ -77,8 +77,8 @@
                 @Override
                 protected Boolean doInBackground(Void... params) {
                     Bundle extras = new Bundle();
-                    extras.putBoolean(LauncherSettings.Settings.EXTRA_DEFAULT_VALUE, false);
-                    Bundle value = getActivity().getContentResolver().call(
+                    extras.putBoolean(LauncherSettings.Settings.EXTRA_DEFAULT_VALUE, true);
+                    Bundle value = pref.getContext().getContentResolver().call(
                             LauncherSettings.Settings.CONTENT_URI,
                             LauncherSettings.Settings.METHOD_GET_BOOLEAN,
                             pref.getKey(), extras);