From c99582205e36b4a9c0a00d810fc31755efeaad61 Mon Sep 17 00:00:00 2001
From: d34d <clark@cyngn.com>
Date: Thu, 31 Mar 2016 09:49:42 -0700
Subject: [PATCH] LLS: Don't build LlsInfo when defComponent is empty

Unflattening an empty string will result in a null ComponentName
which will cause an IllegalArgumentException when building the
LiveLockScreenInfo.

Change-Id: I0bafddb48a47ef67d9833cd12bff7eb34369425e
---
 .../platform/internal/LiveLockScreenServiceBroker.java         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cm/lib/main/java/org/cyanogenmod/platform/internal/LiveLockScreenServiceBroker.java b/cm/lib/main/java/org/cyanogenmod/platform/internal/LiveLockScreenServiceBroker.java
index e85e683..d14e2b9 100644
--- a/cm/lib/main/java/org/cyanogenmod/platform/internal/LiveLockScreenServiceBroker.java
+++ b/cm/lib/main/java/org/cyanogenmod/platform/internal/LiveLockScreenServiceBroker.java
@@ -30,6 +30,7 @@ import android.os.Message;
 import android.os.RemoteCallbackList;
 import android.os.RemoteException;
 import android.os.SystemClock;
+import android.text.TextUtils;
 import android.util.Slog;
 
 import com.android.server.SystemService;
@@ -249,7 +250,7 @@ public class LiveLockScreenServiceBroker extends SystemService {
             // Initialize the default LLS component
             String defComponent = CMSettings.Secure.getString(mContext.getContentResolver(),
                     CMSettings.Secure.DEFAULT_LIVE_LOCK_SCREEN_COMPONENT);
-            if (defComponent != null) {
+            if (!TextUtils.isEmpty(defComponent)) {
                 mDefaultLlsInfo = new LiveLockScreenInfo.Builder()
                         .setComponent(ComponentName.unflattenFromString(defComponent))
                         .build();