commit | 65d3a457d2152a431d158352257e3c846fc8a367 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Tue May 23 20:34:54 2017 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue May 23 20:34:56 2017 +0000 |
tree | 5bac076f48ce8946c637094b83d179405d23ac72 | |
parent | f523227a6e5f336acd01505f23379fbd45c5981b [diff] | |
parent | 290563a33b165de7d1e7ed643d5ebdac5bd7ce0e [diff] |
Merge "Consider the last inserted SIM for EmergencyAffordance"
diff --git a/services/core/java/com/android/server/emergency/EmergencyAffordanceService.java b/services/core/java/com/android/server/emergency/EmergencyAffordanceService.java index 98771df..a91fe77 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 @@ List<SubscriptionInfo> activeSubscriptionInfoList = mSubscriptionManager.getActiveSubscriptionInfoList(); if (activeSubscriptionInfoList == null) { + setSimNeedsEmergencyAffordance(neededNow); return neededNow; } for (SubscriptionInfo info : activeSubscriptionInfoList) {