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

Commit c5efffd3 authored by Ricardo Cerqueira's avatar Ricardo Cerqueira Committed by Steve Kondik
Browse files

StatusBarPolicy: Fix system_server crashes when radio isn't initialized 

If the radio is still initializing when we reach the lockscreen, there is no service state object, but we were attempting to read it anyway to see if emergency mode applied (resulting in a system_server crash). This fixes it.

Change-Id: I71d52b033a162cdb0604af8e00c50ec1740f8302
parent c3a024d2

services/java/com/android/server/status/StatusBarPolicy.java

+2 −1
Original line number Diff line number Diff line
@@ -1045,7 +1045,8 @@ public class StatusBarPolicy { 
        int[] iconList;



        // Display signal strength while in "emergency calls only" mode

        if (!hasService() && !mServiceState.isEmergencyOnly()) {

        if (!hasService() && mServiceState != null 

                && !mServiceState.isEmergencyOnly()) {

            //Slog.d(TAG, "updateSignalStrength: no service");

            if (Settings.System.getInt(mContext.getContentResolver(),

                    Settings.System.AIRPLANE_MODE_ON, 0) == 1) {