OSDN Git Service

Revert "Revert "Update VPN capabilities when its underlying network set is null.""
authorVarun Anand <vaanand@google.com>
Thu, 14 Mar 2019 18:28:00 +0000 (18:28 +0000)
committerVarun Anand <vaanand@google.com>
Thu, 14 Mar 2019 18:31:55 +0000 (18:31 +0000)
commit9f98789d3f3642bacc3f339009e8a7938ce5761b
tree9fc7c16e99646d100c8d89a53377fb35cc750a4c
parent6a050c7c50fa0838d7e29b8c6e244018044246db
Revert "Revert "Update VPN capabilities when its underlying network set is null.""

This reverts commit 6a050c7c50fa0838d7e29b8c6e244018044246db.

Reason for revert: Retargeted for June monthly release

Bug: 119129310

Change-Id: I9d543415c5707859cfa2a14a1a8ce5909aae7d11
Merged-In: Id0abc4d304bb096e92479a118168690ccce634ed
services/core/java/com/android/server/ConnectivityService.java
services/core/java/com/android/server/connectivity/Vpn.java
tests/net/java/com/android/server/ConnectivityServiceTest.java
tests/net/java/com/android/server/connectivity/VpnTest.java