commit 62be2c7cc8fc4a8a6f2129ab4792fce18034a0ce
author Jack Yu <jackyu@google.com> Wed Jun 12 14:12:25 2019 -0700
committer Jack Yu <jackyu@google.com> Wed Jun 12 16:28:18 2019 -0700
tree 9add8563fede840c430cc659197ac1dc9ebafc72
parent 6dcb30ccb622dce7bd8061dd4f543d79eb1b390f

Fixed crash in getActiveDataSubscriptionId

Fixed by adding null check. If phone switcher is not ready,
use default data sub id from settings.

Bug: 135059959
Test: Manual
Change-Id: Ib62dd6cdf0d547e6f990bbdfb00e82698dc47794

src/java/com/android/internal/telephony/SubscriptionController.java

diff --git a/src/java/com/android/internal/telephony/SubscriptionController.java b/src/java/com/android/internal/telephony/SubscriptionController.java
index 799de6e..7792d38 100644
--- a/src/java/com/android/internal/telephony/SubscriptionController.java
+++ b/src/java/com/android/internal/telephony/SubscriptionController.java
@@ -3779,11 +3779,16 @@
         final long token = Binder.clearCallingIdentity();
 
         try {
-            int subId = PhoneSwitcher.getInstance().getActiveDataSubId();
-            if (!SubscriptionManager.isUsableSubscriptionId(subId)) {
-                subId = getDefaultDataSubId();
+            PhoneSwitcher phoneSwitcher = PhoneSwitcher.getInstance();
+            if (phoneSwitcher != null) {
+                int activeDataSubId = phoneSwitcher.getActiveDataSubId();
+                if (SubscriptionManager.isUsableSubscriptionId(activeDataSubId)) {
+                    return activeDataSubId;
+                }
             }
-            return subId;
+            // If phone switcher isn't ready, or active data sub id is not available, use default
+            // sub id from settings.
+            return getDefaultDataSubId();
         } finally {
             Binder.restoreCallingIdentity(token);
         }