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"

Browse Source
This commit is contained in:
Treehugger Robot
2022-03-22 03:40:10 +00:00
committed by Gerrit Code Review
parent 88e08cbb06 37ffc3a20f
commit 4945597773
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.ZoneOffset;
import java.time.ZonedDateTime; import java.time.ZonedDateTime;
import java.time.temporal.ChronoUnit; import java.time.temporal.ChronoUnit;
import java.util.Objects;
import java.util.Set; import java.util.Set;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@@ -222,8 +221,10 @@ public class MultipathPolicyTracker {
"Can't get TelephonyManager for subId %d", mSubId)); "Can't get TelephonyManager for subId %d", mSubId));
} }
subscriberId = Objects.requireNonNull(tele.getSubscriberId(), subscriberId = tele.getSubscriberId();
"Null subscriber Id for subId " + mSubId); if (subscriberId == null) {
throw new IllegalStateException("Null subscriber Id for subId " + mSubId);
}
mNetworkTemplate = new NetworkTemplate.Builder(NetworkTemplate.MATCH_MOBILE) mNetworkTemplate = new NetworkTemplate.Builder(NetworkTemplate.MATCH_MOBILE)
.setSubscriberIds(Set.of(subscriberId)) .setSubscriberIds(Set.of(subscriberId))
.setMeteredness(NetworkStats.METERED_YES) .setMeteredness(NetworkStats.METERED_YES)