Merge "Add null check for lifecycle"

2017-10-17 17:23:01 +00:00
parent 0d1dfd2c7b cd3e26a24a
commit 197eef2cac
1 changed files with 1 additions and 1 deletions
--- a/packages/SettingsLib/src/com/android/settingslib/development/AbstractLogpersistPreferenceController.java
+++ b/packages/SettingsLib/src/com/android/settingslib/development/AbstractLogpersistPreferenceController.java
@@ -68,7 +68,7 @@ public abstract class AbstractLogpersistPreferenceController extends

    public AbstractLogpersistPreferenceController(Context context, Lifecycle lifecycle) {
        super(context);
-        if (isAvailable()) {
+        if (isAvailable() && lifecycle != null) {
            lifecycle.addObserver(this);
        }
    }