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

am: 96926cac25 Change-Id: I663415938196335bd27d9172b59d5f169a0609e3
2017-05-23 20:50:12 +00:00
parent 1cb063d3ed 96926cac25
commit c6845e017a
1 changed files with 1 additions and 0 deletions
--- a/services/core/java/com/android/server/emergency/EmergencyAffordanceService.java
+++ b/services/core/java/com/android/server/emergency/EmergencyAffordanceService.java
@@ -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) {