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"

Browse Source 
am: 65d3a457d2

Change-Id: I3b7bfb3963b61c4589811e8c27e4f89ff501096e
This commit is contained in:
Ruthwar Kumar Ambeer
2017-05-23 20:43:10 +00:00
committed by android-build-merger
parent 9e317f8743 65d3a457d2
commit 96926cac25
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) {