commit 71f9a6f7a92f2d734a00016d84de21946f8198f9
author Jeff Sharkey <jsharkey@google.com> Tue Oct 20 23:08:08 2015 +0000
committer android-build-merger <android-build-merger@google.com> Tue Oct 20 23:08:08 2015 +0000
tree 2f03e19f9877a924a8f3f881e81498cf589b701a
parent f670e6f4936d50d761b16390ef31a7db68b5f2bf
parent 647afb199eb60f20bf3dcc49d48bffd46bb2d0d5

Merge "Ignore network policies with missing IMSI." into mnc-dr-dev am: 38463bb950 am: 5d7604323f am: 3b30aae6e7
am: 647afb199e

* commit '647afb199eb60f20bf3dcc49d48bffd46bb2d0d5':
  Ignore network policies with missing IMSI.

core/java/android/net/NetworkTemplate.java

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 @@
         } 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);
         }
     }