diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2015-08-19 20:48:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-19 20:48:31 +0000 |
| commit | 11e84bde9e98cb4b777a67208989d259883e9375 (patch) | |
| tree | 17955cf7284fc4762f792c4be442698d37c6febd /services/tests | |
| parent | e3de6c5df5a94e627c5ee0f188cbb066233a3dd0 (diff) | |
| parent | aae613d96134245af7c55976731a49fa59e77470 (diff) | |
| download | frameworks_base-11e84bde9e98cb4b777a67208989d259883e9375.zip frameworks_base-11e84bde9e98cb4b777a67208989d259883e9375.tar.gz frameworks_base-11e84bde9e98cb4b777a67208989d259883e9375.tar.bz2 | |
Merge "Don't mark NetworkRequests restricted when they don't have restricted caps" into mnc-dev
Diffstat (limited to 'services/tests')
| -rw-r--r-- | services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java b/services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java index 696f106..b4c76b7 100644 --- a/services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java @@ -943,8 +943,7 @@ public class ConnectivityServiceTest extends AndroidTestCase { if (capability == NET_CAPABILITY_CBS || capability == NET_CAPABILITY_DUN || capability == NET_CAPABILITY_EIMS || capability == NET_CAPABILITY_FOTA || capability == NET_CAPABILITY_IA || capability == NET_CAPABILITY_IMS || - capability == NET_CAPABILITY_RCS || capability == NET_CAPABILITY_XCAP || - capability == NET_CAPABILITY_TRUSTED || capability == NET_CAPABILITY_NOT_VPN) { + capability == NET_CAPABILITY_RCS || capability == NET_CAPABILITY_XCAP) { assertFalse(nc.hasCapability(NET_CAPABILITY_NOT_RESTRICTED)); } else { assertTrue(nc.hasCapability(NET_CAPABILITY_NOT_RESTRICTED)); |