OSDN Git Service

Unify behavior of various cases of "no underlying networks"
authorChalard Jean <jchalard@google.com>
Mon, 21 May 2018 06:30:56 +0000 (15:30 +0900)
committerChalard Jean <jchalard@google.com>
Wed, 6 Jun 2018 08:25:10 +0000 (08:25 +0000)
commit3bd570585717624c0387a13a5f82bff89d41856d
treec0ffd70274bfa823582ab9a01de868fd5862a08e
parent8d53829ca05f4fe663f6afce65c0831854a92dee
Unify behavior of various cases of "no underlying networks"

Before this change, VPNs having no underlying networks would be
marked as metered as the safe option, but VPNs having only
disconnected underlying networks would be marked as unmetered.
Fix this discrepancy.

Clean cherry-pick of ag/4113809

Bug: 79748782
Test: runtest frameworks-net
Change-Id: Ie6ace6bd95139605ffcfa8cd6c15cf28f8fa28c8
Merged-In: If19b85325e7d684e645470293b3c8a674084c641
Merged-in: I22f80a6a39d4a19ff74aa61fcbd66f1a041b1003
services/core/java/com/android/server/connectivity/Vpn.java
tests/net/java/com/android/server/ConnectivityServiceTest.java