Fixing crash on Lollipop
Fragment.getContext is available from MNC onwards.
Using getActivity instead
Change-Id: I99ef98947879ff165895fc76facb438cd4b8b414
diff --git a/src/com/android/launcher3/SettingsActivity.java b/src/com/android/launcher3/SettingsActivity.java
index 5ef6dd5..cedeb39 100644
--- a/src/com/android/launcher3/SettingsActivity.java
+++ b/src/com/android/launcher3/SettingsActivity.java
@@ -59,7 +59,7 @@
// Launcher supports rotation by default. No need to show this setting.
getPreferenceScreen().removePreference(rotationPref);
} else {
- ContentResolver resolver = getContext().getContentResolver();
+ ContentResolver resolver = getActivity().getContentResolver();
mRotationLockObserver = new SystemDisplayRotationLockObserver(rotationPref, resolver);
// Register a content observer to listen for system setting changes while
@@ -70,14 +70,14 @@
// Initialize the UI once
mRotationLockObserver.onChange(true);
- rotationPref.setDefaultValue(Utilities.getAllowRotationDefaultValue(getContext()));
+ rotationPref.setDefaultValue(Utilities.getAllowRotationDefaultValue(getActivity()));
}
}
@Override
public void onDestroy() {
if (mRotationLockObserver != null) {
- getContext().getContentResolver().unregisterContentObserver(mRotationLockObserver);
+ getActivity().getContentResolver().unregisterContentObserver(mRotationLockObserver);
mRotationLockObserver = null;
}
super.onDestroy();