diff options
| author | Jeff Sharkey <jsharkey@google.com> | 2015-10-20 17:21:46 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-10-20 17:21:46 +0000 |
| commit | 38463bb950390a7b50fb07a990d9ed6990d07539 (patch) | |
| tree | 3d883db5c428b63eedae452e684fb0df0d680faf /core | |
| parent | 840f38905c073044077cb2bef68d20971f5d3d39 (diff) | |
| parent | 56859f323c1e7da9d537478e080d73614b207376 (diff) | |
| download | frameworks_base-38463bb950390a7b50fb07a990d9ed6990d07539.zip frameworks_base-38463bb950390a7b50fb07a990d9ed6990d07539.tar.gz frameworks_base-38463bb950390a7b50fb07a990d9ed6990d07539.tar.bz2 | |
Merge "Ignore network policies with missing IMSI." into mnc-dr-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/net/NetworkTemplate.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/net/NetworkTemplate.java b/core/java/android/net/NetworkTemplate.java index 57eef83..b7a411e 100644 --- a/core/java/android/net/NetworkTemplate.java +++ b/core/java/android/net/NetworkTemplate.java @@ -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); } } |