Merge "Consider the last inserted SIM for EmergencyAffordance" into oc-dev

2017-05-24 21:28:05 +00:00
parent 52ca75011b 3d465761d7
commit ef98275635
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) {