Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix crash when MultipathPolicyTracker cannot get IMSI" am: 4945597773 am: 695013ba7a

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2030268

Change-Id: I6209f8059749fe5bd50e643566597ee786699f62
This commit is contained in:
Treehugger Robot
2022-03-22 04:03:10 +00:00
committed by Automerger Merge Worker
parent 1a353ab22f 695013ba7a
commit 9c7fb28831
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/connectivity/MultipathPolicyTracker.java
View File

@@ -71,7 +71,6 @@ import java.time.ZoneId;
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 @@ public class MultipathPolicyTracker {
"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)