commit b04a5eab84687d39685a75a04d62b4303134379a
author Victor Chang <vichang@google.com> Mon May 30 20:36:30 2016 +0100
committer Victor Chang <vichang@google.com> Fri Jun 03 17:14:32 2016 +0100
tree 3cf95cbd54b307c12f5c1735d567c4e2d2be034e
parent aa2e02348a26abdfec437af62a4085f49ff449c1

Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on

Cause: It revoked the user consent of the vpn app without reseting always-on vpn.
In addition, prepareVpn sets legacy vpn as the current package, the state in
Vpn.class is broken, as it thought the current always-on package is legacy vpn,
(mAlwaysOn is only for app vpn, not for legacy vpn). As a result, prepareVpn rejects
all VpnService.prepare.

Bug: 29031820
Change-Id: Id6bf1d6f38cf134a872811806301b8a602fb5725