From cd3e26a24a36877a90858e538b2b935eaae38548 Mon Sep 17 00:00:00 2001
From: jeffreyhuang <jeffreyhuang@google.com>
Date: Mon, 16 Oct 2017 16:59:54 -0700
Subject: [PATCH] Add null check for lifecycle

 - Add a null check so that search works correctly in
 DevelopmentSettingsDashboardFragment

Bug: 34203528
Test: Manual Testing
Change-Id: I26e84d2dcb403a2e68d092056a6c8940becedeff
---
 .../development/AbstractLogpersistPreferenceController.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/SettingsLib/src/com/android/settingslib/development/AbstractLogpersistPreferenceController.java b/packages/SettingsLib/src/com/android/settingslib/development/AbstractLogpersistPreferenceController.java
index 67553adc528c6..77b2d86c445fb 100644
--- 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);
         }
     }