OSDN Git Service

Merge changes from topic "niap-vpn" into qt-dev
authorLorenzo Colitti <lorenzo@google.com>
Thu, 25 Apr 2019 04:23:01 +0000 (04:23 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 25 Apr 2019 04:23:01 +0000 (04:23 +0000)
commit067b9dc406513530a3f4550ba9721d2fc9154fc1
tree8fd8137ec9b041d094f7259ceb4da3937fdfbbc0
parent7c94df4903410aa2b889d85a977229c0859d1e5b
parent123847466ea23336cc485cc09f8a233866d3f035
Merge changes from topic "niap-vpn" into qt-dev

* changes:
  Reinstate new VPN uid filtering unit tests
  Revert new tests and PackageManager mock
  Block incoming non-VPN packets to apps under fully-routed VPN
tests/net/java/com/android/server/ConnectivityServiceTest.java