ADHOC/replicant-vendor_cmsdk
3
0
Fork 0
Code Issues Pull Requests Releases Activity

cmsdk: Fix crash when getting LiveDisplay config

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

Change-Id: I17476438995b581050feda346d0348228519ff44
This commit is contained in:
Steve Kondik 2016-04-25 16:34:21 -07:00 committed by Gerrit Code Review
parent c68b38ac3a
commit 35315d3c0f
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cm/lib/main/java/org/cyanogenmod/platform/internal/display/LiveDisplayService.java
View File

@ -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_DAY;
import static cyanogenmod.hardware.LiveDisplayManager.MODE_FIRST; import static cyanogenmod.hardware.LiveDisplayManager.MODE_FIRST;
import static cyanogenmod.hardware.LiveDisplayManager.MODE_LAST; import static cyanogenmod.hardware.LiveDisplayManager.MODE_LAST;
import static cyanogenmod.hardware.LiveDisplayManager.MODE_OFF;
import static cyanogenmod.hardware.LiveDisplayManager.MODE_OUTDOOR; import static cyanogenmod.hardware.LiveDisplayManager.MODE_OUTDOOR;
import android.app.Notification; import android.app.Notification;
@ -357,13 +358,20 @@ public class LiveDisplayService extends SystemService {
@Override @Override
public int getMode() { public int getMode() {
if (mConfig.hasModeSupport()) {
return mModeObserver.getMode(); return mModeObserver.getMode();
} else {
return MODE_OFF;
}
} }
@Override @Override
public boolean setMode(int mode) { public boolean setMode(int mode) {
mContext.enforceCallingOrSelfPermission( mContext.enforceCallingOrSelfPermission(
cyanogenmod.platform.Manifest.permission.MANAGE_LIVEDISPLAY, null); cyanogenmod.platform.Manifest.permission.MANAGE_LIVEDISPLAY, null);
if (!mConfig.hasModeSupport()) {
return false;
}
return mModeObserver.setMode(mode); return mModeObserver.setMode(mode);
} }

3
sdk/src/java/cyanogenmod/hardware/LiveDisplayConfig.java
View File

@ -132,7 +132,8 @@ public class LiveDisplayConfig implements Parcelable {
ParcelInfo parcelInfo = Concierge.prepareParcel(out); ParcelInfo parcelInfo = Concierge.prepareParcel(out);
// ==== FIG ===== // ==== FIG =====
out.writeLong(mCapabilities.toLongArray()[0]); long[] caps = mCapabilities.toLongArray();
out.writeLong(caps != null && caps.length > 0 ? caps[0] : 0L);
out.writeInt(mDefaultMode); out.writeInt(mDefaultMode);
out.writeInt(mDefaultDayTemperature); out.writeInt(mDefaultDayTemperature);
out.writeInt(mDefaultNightTemperature); out.writeInt(mDefaultNightTemperature);