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

Commit 096d13fa authored by Jeff Sharkey's avatar Jeff Sharkey Committed by android-build-merger
Browse files

Merge "Ignore network policies with missing IMSI." into mnc-dr-dev am: 38463bb9 am: 5d760432 

am: 3b30aae6

* commit '3b30aae6':
  Ignore network policies with missing IMSI.
parents 27c5cbe5 3b30aae6

core/java/android/net/NetworkTemplate.java

+2 −1
Original line number Diff line number Diff line
@@ -288,7 +288,8 @@ public class NetworkTemplate implements Parcelable { 
        } else {

            final boolean matchesType = (sForceAllNetworkTypes

                    || contains(DATA_USAGE_NETWORK_TYPES, ident.mType));

            return matchesType && ArrayUtils.contains(mMatchSubscriberIds, ident.mSubscriberId);

            return matchesType && !ArrayUtils.isEmpty(mMatchSubscriberIds)

                    && ArrayUtils.contains(mMatchSubscriberIds, ident.mSubscriberId);

        }

    }