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

Commit ff8f2cea authored by Ruthwar Kumar Ambeer's avatar Ruthwar Kumar Ambeer Committed by android-build-merger
Browse files

Merge "Consider the last inserted SIM for EmergencyAffordance" am: 65d3a457... 

Merge "Consider the last inserted SIM for EmergencyAffordance" am: 65d3a457 am: 96926cac am: c6845e01
am: cb556d0b

Change-Id: I23257271abc26bb6adc9966f7fceb24cc0fbd435
parents 7c648b27 cb556d0b

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

+1 −0
Original line number Diff line number Diff line
@@ -219,6 +219,7 @@ public class EmergencyAffordanceService extends SystemService { 
        List<SubscriptionInfo> activeSubscriptionInfoList =

                mSubscriptionManager.getActiveSubscriptionInfoList();

        if (activeSubscriptionInfoList == null) {

            setSimNeedsEmergencyAffordance(neededNow);

            return neededNow;

        }

        for (SubscriptionInfo info : activeSubscriptionInfoList) {