From ea2810ad0f0d9562d0c8764b10a258b4f4dc869e Mon Sep 17 00:00:00 2001
From: Alan Viverette <alanv@google.com>
Date: Thu, 16 Oct 2014 18:27:18 -0700
Subject: [PATCH] Prevent NPE when no accessibility services are enabled

BUG: 18023183
Change-Id: Icad0631410f1436f7726bd7311ac3b766a2c46b2
---
 .../ToggleAccessibilityServicePreferenceFragment.java        | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
index f38d482863b..51b5ca992c5 100644
--- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
@@ -194,9 +194,10 @@ public class ToggleAccessibilityServicePreferenceFragment
     }
 
     private void updateSwitchBarToggleSwitch() {
-        String settingValue = Settings.Secure.getString(getContentResolver(),
+        final String settingValue = Settings.Secure.getString(getContentResolver(),
                 Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES);
-        final boolean checked = settingValue.contains(mComponentName.flattenToString());
+        final boolean checked = settingValue != null
+                && settingValue.contains(mComponentName.flattenToString());
         mSwitchBar.setCheckedInternal(checked);
     }