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

Commit cb556d0b 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 am: 96926cac 

am: c6845e01

Change-Id: Ifd84c571e83da3dca1ef87805506570e41caad16
parents 128898d7 c6845e01

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) {