Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jeff Sharkey
2015-10-20 17:21:46 +00:00
committed by Android (Google) Code Review
parent 840f38905c 56859f323c
commit 38463bb950
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/net/NetworkTemplate.java
View File

@@ -288,7 +288,8 @@ public class NetworkTemplate implements Parcelable {
} else { } else {
final boolean matchesType = (sForceAllNetworkTypes final boolean matchesType = (sForceAllNetworkTypes
|| contains(DATA_USAGE_NETWORK_TYPES, ident.mType)); || contains(DATA_USAGE_NETWORK_TYPES, ident.mType));
return matchesType && ArrayUtils.contains(mMatchSubscriberIds, ident.mSubscriberId); return matchesType && !ArrayUtils.isEmpty(mMatchSubscriberIds)
&& ArrayUtils.contains(mMatchSubscriberIds, ident.mSubscriberId);
} }
} }