From 95bb1d5c8838fcdcecdc074c1fbebe3f589907b7 Mon Sep 17 00:00:00 2001
From: Vineet Patil <vpatil@cyngn.com>
Date: Mon, 30 Nov 2015 16:27:09 -0800
Subject: [PATCH] Protected Components: Adding validator. Fixing crash in
 Trebuchet due to missing validator.

Change-Id: Id79784c82ae2851d4beb54d6c46496b3f3e4d2d7
---
 .../cyanogenmod/providers/CMSettings.java     | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/java/cyanogenmod/providers/CMSettings.java b/src/java/cyanogenmod/providers/CMSettings.java
index ca93885e..4b563bc1 100644
--- a/src/java/cyanogenmod/providers/CMSettings.java
+++ b/src/java/cyanogenmod/providers/CMSettings.java
@@ -761,6 +761,26 @@ public final class CMSettings {
             }
         }
 
+        /**
+         * @hide
+         */
+        public static final Validator PROTECTED_COMPONENTS_VALIDATOR = new Validator() {
+            private final String mDelimiter = "|";
+
+            @Override
+            public boolean validate(String value) {
+                if (!TextUtils.isEmpty(value)) {
+                    final String[] array = TextUtils.split(value, Pattern.quote(mDelimiter));
+                    for (String item : array) {
+                        if (TextUtils.isEmpty(item)) {
+                            return false; // Empty components not allowed
+                        }
+                    }
+                }
+                return true;  // Empty list is allowed though.
+            }
+        };
+
         // region System Settings
 
         /**
@@ -2004,6 +2024,7 @@ public final class CMSettings {
                     NOTIFICATION_LIGHT_PULSE_CUSTOM_ENABLE_VALIDATOR);
             VALIDATORS.put(NOTIFICATION_LIGHT_PULSE_CUSTOM_VALUES,
                     NOTIFICATION_LIGHT_PULSE_CUSTOM_VALUES_VALIDATOR);
+            VALIDATORS.put(Secure.PROTECTED_COMPONENTS, PROTECTED_COMPONENTS_VALIDATOR);
         };
         // endregion
     }