Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2017-05-24 21:28:05 +00:00
committed by Android (Google) Code Review
parent 52ca75011b 3d465761d7
commit ef98275635
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
services/core/java/com/android/server/emergency/EmergencyAffordanceService.java
View File

@@ -219,6 +219,7 @@ public class EmergencyAffordanceService extends SystemService {
List<SubscriptionInfo> activeSubscriptionInfoList = List<SubscriptionInfo> activeSubscriptionInfoList =
mSubscriptionManager.getActiveSubscriptionInfoList(); mSubscriptionManager.getActiveSubscriptionInfoList();
if (activeSubscriptionInfoList == null) { if (activeSubscriptionInfoList == null) {
setSimNeedsEmergencyAffordance(neededNow);
return neededNow; return neededNow;
} }
for (SubscriptionInfo info : activeSubscriptionInfoList) { for (SubscriptionInfo info : activeSubscriptionInfoList) {