aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authord34d <clark@cyngn.com>2016-03-31 09:49:42 -0700
committerd34d <clark@cyngn.com>2016-03-31 09:49:42 -0700
commitc99582205e36b4a9c0a00d810fc31755efeaad61 (patch)
tree22d8a05e73c47414ee183f6e473b8174f3442039
parenta50a3237244f05d248f06de816e233bf6252c240 (diff)
downloadvendor_cmsdk-c99582205e36b4a9c0a00d810fc31755efeaad61.zip
vendor_cmsdk-c99582205e36b4a9c0a00d810fc31755efeaad61.tar.gz
vendor_cmsdk-c99582205e36b4a9c0a00d810fc31755efeaad61.tar.bz2
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
-rw-r--r--cm/lib/main/java/org/cyanogenmod/platform/internal/LiveLockScreenServiceBroker.java3
1 files changed, 2 insertions, 1 deletions
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();