Merge "Consider the last inserted SIM for EmergencyAffordance"

am: 65d3a457d2 Change-Id: I3b7bfb3963b61c4589811e8c27e4f89ff501096e
2017-05-23 20:43:10 +00:00
parent 9e317f8743 65d3a457d2
commit 96926cac25
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) {