cmsdk: Fix crash when getting LiveDisplay config

 * If capabilities is empty, BitSet.toLongArray returns an empty array.

Change-Id: I17476438995b581050feda346d0348228519ff44

1 files changed, 9 insertions, 1 deletions

diff --git a/cm/lib/main/java/org/cyanogenmod/platform/internal/display/LiveDisplayService.java b/cm/lib/main/java/org/cyanogenmod/platform/internal/display/LiveDisplayService.java
index 015025d..70183f6 100644
--- a/cm/lib/main/java/org/cyanogenmod/platform/internal/display/LiveDisplayService.java
+++ b/cm/lib/main/java/org/cyanogenmod/platform/internal/display/LiveDisplayService.java
@@ -19,6 +19,7 @@ import static cyanogenmod.hardware.LiveDisplayManager.FEATURE_MANAGED_OUTDOOR_MO
 import static cyanogenmod.hardware.LiveDisplayManager.MODE_DAY;
 import static cyanogenmod.hardware.LiveDisplayManager.MODE_FIRST;
 import static cyanogenmod.hardware.LiveDisplayManager.MODE_LAST;
+import static cyanogenmod.hardware.LiveDisplayManager.MODE_OFF;
 import static cyanogenmod.hardware.LiveDisplayManager.MODE_OUTDOOR;
 
 import android.app.Notification;
@@ -357,13 +358,20 @@ public class LiveDisplayService extends SystemService {
 
         @Override
         public int getMode() {
-            return mModeObserver.getMode();
+            if (mConfig.hasModeSupport()) {
+                return mModeObserver.getMode();
+            } else {
+                return MODE_OFF;
+            }
         }
 
         @Override
         public boolean setMode(int mode) {
             mContext.enforceCallingOrSelfPermission(
                     cyanogenmod.platform.Manifest.permission.MANAGE_LIVEDISPLAY, null);
+            if (!mConfig.hasModeSupport()) {
+                return false;
+            }
             return mModeObserver.setMode(mode);
         }