Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1891b064 authored by Bruno Martins's avatar Bruno Martins Committed by Dan Pasanen
Browse files

LiveDisplayTile: Avoid NPE during boot up phase 

 * During boot, with LineageHW not yet initialized there is no way to
   check the current LiveDisplay mode. In such cases, fallback to AUTO.

Change-Id: Ifc004c86dfd68f73b8a362a1c833cbc3e7397811
parent a32fdedb

packages/SystemUI/src/com/android/systemui/qs/tiles/LiveDisplayTile.java

+9 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
package com.android.systemui.qs.tiles;



import static lineageos.hardware.LiveDisplayManager.FEATURE_MANAGED_OUTDOOR_MODE;

import static lineageos.hardware.LiveDisplayManager.MODE_AUTO;

import static lineageos.hardware.LiveDisplayManager.MODE_DAY;

import static lineageos.hardware.LiveDisplayManager.MODE_OUTDOOR;
@@ -152,7 +153,14 @@ public class LiveDisplayTile extends QSTileImpl<LiveDisplayState> { 
    }



    private int getCurrentModeIndex() {

        return ArrayUtils.indexOf(mValues, String.valueOf(mLiveDisplay.getMode()));

        String currentLiveDisplayMode = null;

        try {

            currentLiveDisplayMode = String.valueOf(mLiveDisplay.getMode());

        } catch (NullPointerException e) {

            currentLiveDisplayMode = String.valueOf(MODE_AUTO);

        } finally {

            return ArrayUtils.indexOf(mValues, currentLiveDisplayMode);

        }

    }



    private void changeToNextMode() {