OSDN Git Service

Merge changes from topic "vpn-dialog"
authorCharles He <qiurui@google.com>
Tue, 19 Sep 2017 07:56:44 +0000 (07:56 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 19 Sep 2017 07:56:44 +0000 (07:56 +0000)
commit19bb1a0b99afcbb2ee4cb0f5b5d92011e0cc146f
tree56bb5784be225c1dcf3f30d095d4ecc460badb76
parentcc15c7f8c17624faef67f466dd28985904a743b9
parentc17f50f83d3e35f338095df6065426f2f304a1dc
Merge changes from topic "vpn-dialog"

* changes:
  Unbreak VPN unit tests.
  Add alert dialog when always-on VPN disconnects.
services/core/java/com/android/server/connectivity/Vpn.java
tests/net/java/com/android/server/connectivity/VpnTest.java