diff options
| author | Sooraj Sasindran <sasindran@google.com> | 2019-11-06 11:50:53 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-11-06 11:50:53 -0800 |
| commit | df582accbd21e141e58dc5f10399ea2d1f5327be (patch) | |
| tree | 833124184940e5721e058ddf4f69e00661b9aa9a | |
| parent | dddff7d0d6676ebb7de33821a68158c143c09c66 (diff) | |
| parent | 1aa65cb13e5e2da17ea555293a4dedc2802f356b (diff) | |
| download | platform_packages_services_AlternativeNetworkAccess-df582accbd21e141e58dc5f10399ea2d1f5327be.tar.gz platform_packages_services_AlternativeNetworkAccess-df582accbd21e141e58dc5f10399ea2d1f5327be.tar.bz2 platform_packages_services_AlternativeNetworkAccess-df582accbd21e141e58dc5f10399ea2d1f5327be.zip | |
Do not assume default voice sub is always available
am: 1aa65cb13e
Change-Id: Icef19ba64e1eb0fd41f6a671e07a78d15d909399
| -rw-r--r-- | src/com/android/ons/OpportunisticNetworkService.java | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/com/android/ons/OpportunisticNetworkService.java b/src/com/android/ons/OpportunisticNetworkService.java index 6db5fa8..72c0038 100644 --- a/src/com/android/ons/OpportunisticNetworkService.java +++ b/src/com/android/ons/OpportunisticNetworkService.java @@ -127,6 +127,11 @@ public class OpportunisticNetworkService extends Service { } List<SubscriptionInfo> subscriptionInfos = mSubscriptionManager.getActiveSubscriptionInfoList(false); + if (subscriptionInfos == null) { + return; + } + + logDebug("handleSimStateChange: subscriptionInfos - " + subscriptionInfos); for (SubscriptionInfo subscriptionInfo : subscriptionInfos) { if (subscriptionInfo.getSubscriptionId() == carrierAppConfigInput.getPrimarySub()) { return; @@ -413,10 +418,12 @@ public class OpportunisticNetworkService extends Service { final long identity = Binder.clearCallingIdentity(); try { ONSConfigInput onsConfigInput = new ONSConfigInput(availableNetworks, callbackStub); - onsConfigInput.setPrimarySub( - mSubscriptionManager.getDefaultVoiceSubscriptionInfo().getSubscriptionId()); - onsConfigInput.setPreferredDataSub(availableNetworks.get(0).getSubId()); - mONSConfigInputHashMap.put(CARRIER_APP_CONFIG_NAME, onsConfigInput); + SubscriptionInfo subscriptionInfo = mSubscriptionManager.getDefaultVoiceSubscriptionInfo(); + if (subscriptionInfo != null) { + onsConfigInput.setPrimarySub(subscriptionInfo.getSubscriptionId()); + onsConfigInput.setPreferredDataSub(availableNetworks.get(0).getSubId()); + mONSConfigInputHashMap.put(CARRIER_APP_CONFIG_NAME, onsConfigInput); + } if (mIsEnabled) { /* if carrier is reporting availability, then it takes higher priority. */ |