Merge "Ignore network policies with missing IMSI." into mnc-dr-dev

2015-10-20 17:21:46 +00:00
parent 840f38905c 56859f323c
commit 38463bb950
1 changed files with 2 additions and 1 deletions
--- 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);
        }
    }