diff options
| author | Jeff Davidson <jpd@google.com> | 2015-04-27 15:02:48 -0700 |
|---|---|---|
| committer | Jeff Davidson <jpd@google.com> | 2015-05-11 17:50:07 +0000 |
| commit | 0a775ce9801f03071d1e9bcc177d79e6fe350702 (patch) | |
| tree | 42daeaf027e8df5dad7041d94c2bdc6fd377dfcf /libs/hwui/PathCache.cpp | |
| parent | 3ce72722ca14ad9e84ca54920bb2829696f68d53 (diff) | |
| download | frameworks_base-0a775ce9801f03071d1e9bcc177d79e6fe350702.zip frameworks_base-0a775ce9801f03071d1e9bcc177d79e6fe350702.tar.gz frameworks_base-0a775ce9801f03071d1e9bcc177d79e6fe350702.tar.bz2 | |
Ensure VPN consent is not revoked in prepare/establish.
Covers cases where VPN is prepared, but the consent bit has been lost,
e.g. because updates were uninstalled on the current VPN app. In this
case we want prepare to re-trigger the consent flow, and we do not
want establish() to work.
So, when prepare(package, null) is called, as VpnService.prepare()
will do, if we would have otherwise taken no action and returned true
because the VPN was already prepared, we now check if package has lost
its consent and unprepare the VPN (so that it can be prepared by the
VpnSettings ConfirmDialog).
Bug: 18491424
Change-Id: I8fa60dbc2b95e15f9ce61f9b7e6735db745babba
Diffstat (limited to 'libs/hwui/PathCache.cpp')
0 files changed, 0 insertions, 0 deletions