diff options
4 files changed, 30 insertions, 31 deletions
diff --git a/core/java/com/android/internal/net/VpnConfig.java b/core/java/com/android/internal/net/VpnConfig.java index 310b2df47dc5..003c244b2183 100644 --- a/core/java/com/android/internal/net/VpnConfig.java +++ b/core/java/com/android/internal/net/VpnConfig.java @@ -53,15 +53,15 @@ public class VpnConfig implements Parcelable { return PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_CANCEL_CURRENT); } - public String packageName; - public String sessionName; - public String interfaceName; - public PendingIntent configureIntent; + public String packagz; + public String interfaze; + public String session; public int mtu = -1; public String addresses; public String routes; public List<String> dnsServers; public List<String> searchDomains; + public PendingIntent configureIntent; public long startTime = -1; @Override @@ -71,15 +71,15 @@ public class VpnConfig implements Parcelable { @Override public void writeToParcel(Parcel out, int flags) { - out.writeString(packageName); - out.writeString(sessionName); - out.writeString(interfaceName); - out.writeParcelable(configureIntent, flags); + out.writeString(packagz); + out.writeString(interfaze); + out.writeString(session); out.writeInt(mtu); out.writeString(addresses); out.writeString(routes); out.writeStringList(dnsServers); out.writeStringList(searchDomains); + out.writeParcelable(configureIntent, flags); out.writeLong(startTime); } @@ -88,15 +88,15 @@ public class VpnConfig implements Parcelable { @Override public VpnConfig createFromParcel(Parcel in) { VpnConfig config = new VpnConfig(); - config.packageName = in.readString(); - config.sessionName = in.readString(); - config.interfaceName = in.readString(); - config.configureIntent = in.readParcelable(null); + config.packagz = in.readString(); + config.interfaze = in.readString(); + config.session = in.readString(); config.mtu = in.readInt(); config.addresses = in.readString(); config.routes = in.readString(); config.dnsServers = in.createStringArrayList(); config.searchDomains = in.createStringArrayList(); + config.configureIntent = in.readParcelable(null); config.startTime = in.readLong(); return config; } diff --git a/packages/VpnDialogs/res/layout/confirm.xml b/packages/VpnDialogs/res/layout/confirm.xml index 249b6e6e220b..5ab6ee23b894 100644 --- a/packages/VpnDialogs/res/layout/confirm.xml +++ b/packages/VpnDialogs/res/layout/confirm.xml @@ -17,7 +17,8 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="wrap_content" - android:layout_height="wrap_content"> + android:layout_height="wrap_content" + android:padding="5mm"> <ImageView android:id="@+id/icon" android:layout_width="@android:dimen/app_icon_size" @@ -32,7 +33,7 @@ android:layout_alignParentLeft="true" android:layout_alignParentRight="true" android:layout_below="@id/icon" - android:padding="2mm" + android:padding="3mm" android:text="@string/warning" android:textSize="18sp"/> @@ -53,9 +54,7 @@ android:layout_alignParentRight="true" android:layout_below="@id/warning" android:text="@string/accept" - - - android:textSize="18sp" + android:textSize="20sp" android:checked="false"/> </RelativeLayout> diff --git a/packages/VpnDialogs/src/com/android/vpndialogs/ManageDialog.java b/packages/VpnDialogs/src/com/android/vpndialogs/ManageDialog.java index 206ce2337af9..5559c3d7c543 100644 --- a/packages/VpnDialogs/src/com/android/vpndialogs/ManageDialog.java +++ b/packages/VpnDialogs/src/com/android/vpndialogs/ManageDialog.java @@ -65,14 +65,14 @@ public class ManageDialog extends Activity implements Handler.Callback, ServiceManager.getService(Context.CONNECTIVITY_SERVICE)); View view = View.inflate(this, R.layout.manage, null); - if (mConfig.sessionName != null) { - ((TextView) view.findViewById(R.id.session)).setText(mConfig.sessionName); + if (mConfig.session != null) { + ((TextView) view.findViewById(R.id.session)).setText(mConfig.session); } mDuration = (TextView) view.findViewById(R.id.duration); mDataTransmitted = (TextView) view.findViewById(R.id.data_transmitted); mDataReceived = (TextView) view.findViewById(R.id.data_received); - if (mConfig.packageName.equals(VpnConfig.LEGACY_VPN)) { + if (mConfig.packagz.equals(VpnConfig.LEGACY_VPN)) { mDialog = new AlertDialog.Builder(this) .setIcon(android.R.drawable.ic_dialog_info) .setTitle(R.string.legacy_title) @@ -82,7 +82,7 @@ public class ManageDialog extends Activity implements Handler.Callback, .create(); } else { PackageManager pm = getPackageManager(); - ApplicationInfo app = pm.getApplicationInfo(mConfig.packageName, 0); + ApplicationInfo app = pm.getApplicationInfo(mConfig.packagz, 0); mDialog = new AlertDialog.Builder(this) .setIcon(app.loadIcon(pm)) @@ -169,7 +169,7 @@ public class ManageDialog extends Activity implements Handler.Callback, try { // See dev_seq_printf_stats() in net/core/dev.c. in = new DataInputStream(new FileInputStream("/proc/net/dev")); - String prefix = mConfig.interfaceName + ':'; + String prefix = mConfig.interfaze + ':'; while (true) { String line = in.readLine().trim(); diff --git a/services/java/com/android/server/connectivity/Vpn.java b/services/java/com/android/server/connectivity/Vpn.java index ede3ffd1de72..3ba52d9f0949 100644 --- a/services/java/com/android/server/connectivity/Vpn.java +++ b/services/java/com/android/server/connectivity/Vpn.java @@ -198,8 +198,8 @@ public class Vpn extends INetworkManagementEventObserver.Stub { 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 @@ public class Vpn extends INetworkManagementEventObserver.Stub { 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 @@ public class Vpn extends INetworkManagementEventObserver.Stub { 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 @@ public class Vpn extends INetworkManagementEventObserver.Stub { } // 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 @@ public class Vpn extends INetworkManagementEventObserver.Stub { 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); } |