aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruno Martins <bgcngm@gmail.com>2019-01-27 00:52:09 +0000
committerMichael Bestas <mkbestas@lineageos.org>2019-02-04 19:31:43 +0100
commita7d159461d38e0b1d798ff48d2de14b78569f512 (patch)
treed219861810716608821bc7f9d7c084ef1d475524
parentdc5d872a2f363650afddbf5d52a17877f6f38f7a (diff)
downloadlineage-sdk-a7d159461d38e0b1d798ff48d2de14b78569f512.tar.gz
lineage-sdk-a7d159461d38e0b1d798ff48d2de14b78569f512.tar.bz2
lineage-sdk-a7d159461d38e0b1d798ff48d2de14b78569f512.zip
LiveDisplayService: Catch NPE before LiveDisplayConfig is initialized
* During boot up phase the system is trying to update LiveDisplay tile status based on the applied mode. However, with LiveDisplayConfig not yet initialized this results in a NullPointerException. Address it and fallback to MODE_OFF. Change-Id: I736da21455e74801aae69e16b9e80c8985b83a5a
-rw-r--r--lineage/lib/main/java/org/lineageos/platform/internal/display/LiveDisplayService.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/lineage/lib/main/java/org/lineageos/platform/internal/display/LiveDisplayService.java b/lineage/lib/main/java/org/lineageos/platform/internal/display/LiveDisplayService.java
index d671dae1..48d8725e 100644
--- a/lineage/lib/main/java/org/lineageos/platform/internal/display/LiveDisplayService.java
+++ b/lineage/lib/main/java/org/lineageos/platform/internal/display/LiveDisplayService.java
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2016 The CyanogenMod Project
+ * 2019 The LineageOS Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -239,7 +240,7 @@ public class LiveDisplayService extends LineageSystemService {
@Override
public int getMode() {
- if (mConfig.hasModeSupport()) {
+ if (mConfig != null && mConfig.hasModeSupport()) {
return mModeObserver.getMode();
} else {
return MODE_OFF;