From 23c07c8727890670394f055f55bade1452038a99 Mon Sep 17 00:00:00 2001
From: Beverly <beverlyt@google.com>
Date: Mon, 29 Apr 2019 09:52:37 -0400
Subject: [PATCH] Add null check to avoid settings crash

Test: manual
Fixes: 131580180
Change-Id: I128d1b23ca33c06f049d8fe4ca3e56c5abefae5f
---
 ...tractZenModeAutomaticRulePreferenceController.java | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/com/android/settings/notification/AbstractZenModeAutomaticRulePreferenceController.java b/src/com/android/settings/notification/AbstractZenModeAutomaticRulePreferenceController.java
index 58e19165104..f7b32221ea2 100644
--- a/src/com/android/settings/notification/AbstractZenModeAutomaticRulePreferenceController.java
+++ b/src/com/android/settings/notification/AbstractZenModeAutomaticRulePreferenceController.java
@@ -123,11 +123,14 @@ abstract public class AbstractZenModeAutomaticRulePreferenceController extends
             return new ComponentName(ci.packageName, ci.name);
         }
         // old service backed rule
-        final String configurationActivity =
-                ci.metaData.getString(ConditionProviderService.META_DATA_CONFIGURATION_ACTIVITY);
-        if (configurationActivity != null) {
-            return ComponentName.unflattenFromString(configurationActivity);
+        if (ci.metaData != null) {
+            final String configurationActivity = ci.metaData.getString(
+                    ConditionProviderService.META_DATA_CONFIGURATION_ACTIVITY);
+            if (configurationActivity != null) {
+                return ComponentName.unflattenFromString(configurationActivity);
+            }
         }
+
         return null;
     }