aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authord34d <clark@cyngn.com>2016-05-10 09:43:55 -0700
committerGerrit Code Review <gerrit@cyanogenmod.org>2016-05-11 11:18:41 -0700
commit8c8601b9f3993481d2197bd55ab482cb0dabca6a (patch)
treeda84b4b7c548781793b317f16b5654b5c37c3bfe
parent5340c0e45b0d8f7d2f0e9e8ae8548166f69adf48 (diff)
downloadvendor_cmsdk-8c8601b9f3993481d2197bd55ab482cb0dabca6a.zip
vendor_cmsdk-8c8601b9f3993481d2197bd55ab482cb0dabca6a.tar.gz
vendor_cmsdk-8c8601b9f3993481d2197bd55ab482cb0dabca6a.tar.bz2
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
-rw-r--r--cm/lib/main/java/org/cyanogenmod/platform/internal/LiveLockScreenServiceBroker.java2
1 files changed, 1 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 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 */
}