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

Commit 9df81dc2 authored by Selim Cinek's avatar Selim Cinek Committed by android-build-merger
Browse files

Merge "Fixed an issue where the emergency affordance didn't show" into nyc-mr2-dev am: fbf2e0fb 

am: 0fe3d064

Change-Id: I3b86cc62c28c8086ed57505581c33d7b578f893d
parents 22542867 0fe3d064

services/core/java/com/android/server/emergency/EmergencyAffordanceService.java

+11 −9
Original line number Diff line number Diff line
@@ -245,23 +245,25 @@ public class EmergencyAffordanceService extends SystemService { 
                }

            }

        }

        if (neededNow != neededBefore) {

        setSimNeedsEmergencyAffordance(neededNow);

        }

        return neededNow;

    }



    private void setSimNeedsEmergencyAffordance(boolean simNeedsEmergencyAffordance) {

        mSimNeedsEmergencyAffordance = simNeedsEmergencyAffordance;

        if (simNeededAffordanceBefore() != simNeedsEmergencyAffordance) {

            Settings.Global.putInt(mContext.getContentResolver(),

                    EMERGENCY_SIM_INSERTED_SETTING,

                    simNeedsEmergencyAffordance ? 1 : 0);

        }

        if (simNeedsEmergencyAffordance != mSimNeedsEmergencyAffordance) {

            mSimNeedsEmergencyAffordance = simNeedsEmergencyAffordance;

            updateEmergencyAffordanceNeeded();

        }

    }



    private boolean simNeededAffordanceBefore() {

        return Settings.Global.getInt(mContext.getContentResolver(),

                "emergency_sim_inserted_before", 0) != 0;

                EMERGENCY_SIM_INSERTED_SETTING, 0) != 0;

    }



    private boolean handleUpdateCellInfo() {