commit c4c7231eb6d1efa9ecd7b693f8328a76a04e8bbb
author Paul Jensen <pauljensen@google.com> Mon Dec 08 14:04:51 2014 -0500
committer Sander Alewijnse <salewijnse@google.com> Wed Jan 21 18:08:15 2015 +0000
tree b19a996443f5247b2e2b80aa750bb1dd1d5da8f9
parent 9ba23db50c399867dffb0731d145e1831fe9e829

Clear VPN config when VPN disconnects.

This ensures ConnectivityService.getVpnConfig() returns null after a
VPN disconnects.

bug:18640307
Change-Id: I2238eabaf665cad0a4f4258add57611f2b450089

services/core/java/com/android/server/connectivity/Vpn.java

diff --git a/services/core/java/com/android/server/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java
index f08a652..bd0e587 100644
--- a/services/core/java/com/android/server/connectivity/Vpn.java
+++ b/services/core/java/com/android/server/connectivity/Vpn.java
@@ -727,6 +727,7 @@
                 if (interfaze.equals(mInterface) && jniCheck(interfaze) == 0) {
                     mStatusIntent = null;
                     mVpnUsers = null;
+                    mConfig = null;
                     mInterface = null;
                     if (mConnection != null) {
                         mContext.unbindService(mConnection);