commit 34e7813e962de99df9813014678ef5901227c5f1
author Chia-chi Yeh <chiachi@android.com> Sun Jul 03 03:07:07 2011 -0700
committer Chia-chi Yeh <chiachi@android.com> Sun Jul 03 03:07:07 2011 -0700
tree f61cbeefb7febbaf7b90792a16c6339ba7b4de9f
parent 44e27b5c74b5f441973561a4f945cb58e0cc45a4

VPN: minor refinement.

Change-Id: I2b59cbe8554b6c6f8da48c465252489394f32653

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

diff --git a/services/java/com/android/server/connectivity/Vpn.java b/services/java/com/android/server/connectivity/Vpn.java
index ede3ffd..3ba52d9 100644
--- a/services/java/com/android/server/connectivity/Vpn.java
+++ b/services/java/com/android/server/connectivity/Vpn.java
@@ -198,8 +198,8 @@
         mCallback.override(config.dnsServers, config.searchDomains);
 
         // Fill more values.
-        config.packageName = mPackageName;
-        config.interfaceName = mInterfaceName;
+        config.packagz = mPackageName;
+        config.interfaze = mInterfaceName;
 
         // Show the notification!
         showNotification(config, label, bitmap);
@@ -234,8 +234,8 @@
         if (nm != null) {
             String title = (label == null) ? mContext.getString(R.string.vpn_title) :
                     mContext.getString(R.string.vpn_title_long, label);
-            String text = (config.sessionName == null) ? mContext.getString(R.string.vpn_text) :
-                    mContext.getString(R.string.vpn_text_long, config.sessionName);
+            String text = (config.session == null) ? mContext.getString(R.string.vpn_text) :
+                    mContext.getString(R.string.vpn_text_long, config.session);
 
             long identity = Binder.clearCallingIdentity();
             Notification notification = new Notification.Builder(mContext)
@@ -316,7 +316,7 @@
             mDaemons = new String[] {"racoon", "mtpd"};
             mArguments = new String[][] {racoon, mtpd};
 
-            mConfig.packageName = VpnConfig.LEGACY_VPN;
+            mConfig.packagz = VpnConfig.LEGACY_VPN;
         }
 
         public void exit() {
@@ -459,7 +459,7 @@
                 }
 
                 // Now we are connected. Get the interface.
-                mConfig.interfaceName = SystemProperties.get("vpn.via");
+                mConfig.interfaze = SystemProperties.get("vpn.via");
 
                 // Get the DNS servers if they are not set in config.
                 if (mConfig.dnsServers == null || mConfig.dnsServers.size() == 0) {
@@ -477,12 +477,12 @@
                     checkpoint(false);
 
                     // Check if the interface is gone while we are waiting.
-                    if (jniCheckInterface(mConfig.interfaceName) == 0) {
-                        throw new IllegalStateException(mConfig.interfaceName + " is gone");
+                    if (jniCheckInterface(mConfig.interfaze) == 0) {
+                        throw new IllegalStateException(mConfig.interfaze + " is gone");
                     }
 
                     // Now INetworkManagementEventObserver is watching our back.
-                    mInterfaceName = mConfig.interfaceName;
+                    mInterfaceName = mConfig.interfaze;
                     mCallback.override(mConfig.dnsServers, mConfig.searchDomains);
                     showNotification(mConfig, null, null);
                 }