Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c7fb288 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix crash when MultipathPolicyTracker cannot get IMSI" am: 49455977 am: 695013ba 

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

Change-Id: I6209f8059749fe5bd50e643566597ee786699f62
parents 1a353ab2 695013ba

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

+4 −3
Original line number Diff line number Diff line
@@ -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)