commit 494559777326c8f0df821f6c51561d5761be645d
author Treehugger Robot <treehugger-gerrit@google.com> Tue Mar 22 03:40:10 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 22 03:40:10 2022 +0000
tree 8857c3314c2896ae27987587fe3131bce8c0f7d3
parent 88e08cbb06e6eb9f1297957194dea5607117e2d2
parent 37ffc3a20fe4adcb54e0d9e7daca5bedf1b0d0df

Merge "Fix crash when MultipathPolicyTracker cannot get IMSI"

services/core/java/com/android/server/connectivity/MultipathPolicyTracker.java

diff --git a/services/core/java/com/android/server/connectivity/MultipathPolicyTracker.java b/services/core/java/com/android/server/connectivity/MultipathPolicyTracker.java
index 108e7bc..b9efdf5 100644
--- a/services/core/java/com/android/server/connectivity/MultipathPolicyTracker.java
+++ b/services/core/java/com/android/server/connectivity/MultipathPolicyTracker.java
@@ -71,7 +71,6 @@
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
 import java.time.temporal.ChronoUnit;
-import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
@@ -222,8 +221,10 @@
                         "Can't get TelephonyManager for subId %d", mSubId));
             }
 
-            subscriberId = Objects.requireNonNull(tele.getSubscriberId(),
-                    "Null subscriber Id for subId " + mSubId);
+            subscriberId = tele.getSubscriberId();
+            if (subscriberId == null) {
+                throw new IllegalStateException("Null subscriber Id for subId " + mSubId);
+            }
             mNetworkTemplate = new NetworkTemplate.Builder(NetworkTemplate.MATCH_MOBILE)
                     .setSubscriberIds(Set.of(subscriberId))
                     .setMeteredness(NetworkStats.METERED_YES)