From 8c8601b9f3993481d2197bd55ab482cb0dabca6a Mon Sep 17 00:00:00 2001
From: d34d <clark@cyngn.com>
Date: Tue, 10 May 2016 09:43:55 -0700
Subject: [PATCH] LLS: Fix NPE when backing service dies

The mService member variable should not be used directly as this can
cause an NPE if the backing service has died.  Instead, use the
getServiceGuarded() method which will take care of re-establishing
a connection to the backing service.

Change-Id: I290e69c07a2e56644de7a394543d1e36fac1cbcc
TICKET: CYNGNOS-2779
---
 .../platform/internal/LiveLockScreenServiceBroker.java          | 2 +-
 1 file changed, 1 insertion(+), 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 8581162..397a4fe 100644
--- a/cm/lib/main/java/org/cyanogenmod/platform/internal/LiveLockScreenServiceBroker.java
+++ b/cm/lib/main/java/org/cyanogenmod/platform/internal/LiveLockScreenServiceBroker.java
@@ -408,7 +408,7 @@ public class LiveLockScreenServiceBroker extends SystemService {
 
         mDefaultLlsInfo = llsInfo;
         try {
-            mService.updateDefaultLiveLockScreen(llsInfo);
+            getServiceGuarded().updateDefaultLiveLockScreen(llsInfo);
         } catch (RemoteException e) {
             /* ignore */
         }