diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2015-08-19 20:54:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-19 20:54:48 +0000 |
| commit | 0257c82fa122243e97e4a1f4ef4bc4b8c21bd692 (patch) | |
| tree | 42b1a919e842989682d8a13bbb6e43ec5c444f11 /services/tests | |
| parent | 06a86644cca0621696afc38db02f2fe2010f120c (diff) | |
| parent | 11e84bde9e98cb4b777a67208989d259883e9375 (diff) | |
| download | frameworks_base-0257c82fa122243e97e4a1f4ef4bc4b8c21bd692.zip frameworks_base-0257c82fa122243e97e4a1f4ef4bc4b8c21bd692.tar.gz frameworks_base-0257c82fa122243e97e4a1f4ef4bc4b8c21bd692.tar.bz2 | |
am 11e84bde: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into mnc-dev
* commit '11e84bde9e98cb4b777a67208989d259883e9375':
Don't mark NetworkRequests restricted when they don't have restricted caps
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)); |