diff options
| author | 2017-05-24 21:28:05 +0000 | |
|---|---|---|
| committer | 2017-05-24 21:28:11 +0000 | |
| commit | ef982756351ced105fce1d7fdbc92b64e6d9b71c (patch) | |
| tree | 289fedef2022cea1f6a49d0f6d43c24a5ad3cfc6 | |
| parent | 52ca75011b6a636ac3485e58305b102787fd08e9 (diff) | |
| parent | 3d465761d7bc81a763827bf80ac054b67a931ab5 (diff) | |
Merge "Consider the last inserted SIM for EmergencyAffordance" into oc-dev
| -rw-r--r-- | services/core/java/com/android/server/emergency/EmergencyAffordanceService.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/emergency/EmergencyAffordanceService.java b/services/core/java/com/android/server/emergency/EmergencyAffordanceService.java index 98771dfa1f33..a91fe773a5cf 100644 --- 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) { |