OSDN Git Service

Mark networks with OEM_PAID always restricted
authorLorenzo Colitti <lorenzo@google.com>
Fri, 30 Mar 2018 09:21:27 +0000 (09:21 +0000)
committerPavel Maltsev <pavelm@google.com>
Wed, 4 Apr 2018 05:35:54 +0000 (05:35 +0000)
commit83c1e74b1e41f2c093da80ae0eba2442f348cd77
tree1e897ace8f2b8240761eb3ddc737b7c4db5edebb
parent50228a647183c9315312f8f36ba849f8b1e6d3d0
Mark networks with OEM_PAID always restricted

Bug: 68762530
Test: runtest -x frameworks/base/tests/net/ -c android.net.NetworkCapabilitiesTest

Cherry-picked from AOSP with no conflicts

Merged-in: I173ee0a3bc1797d03ba34c5f025844eaada87ee4
Change-Id: I173ee0a3bc1797d03ba34c5f025844eaada87ee4
(cherry picked from commit efbacc0ccb70917b2782272e6b8f1a0fb3f56cbe)
core/java/android/net/NetworkCapabilities.java
tests/net/java/android/net/NetworkCapabilitiesTest.java