Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf6ff2c0 authored by Chad Brubaker's avatar Chad Brubaker
Browse files

Support multiple Vpn ManageDialogs 

Move away from storing the configs in the Intent to prevent issues with
PendingIntents and multiple configs.

The Dialog now queries ConnectivityService for the configuration to
display in the management dialog.

Change-Id: I0e0ef52db840152914d117a24f776d8106e836ff
parent d1c87546

core/java/android/net/IConnectivityManager.aidl

+2 −0
Original line number Diff line number Diff line
@@ -124,6 +124,8 @@ interface IConnectivityManager 


    ParcelFileDescriptor establishVpn(in VpnConfig config);



    VpnConfig getVpnConfig();



    void startLegacyVpn(in VpnProfile profile);



    LegacyVpnInfo getLegacyVpnInfo();

core/java/com/android/internal/net/VpnConfig.java

+3 −5
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.content.Context; 
import android.content.Intent;

import android.os.Parcel;

import android.os.Parcelable;

import android.os.UserHandle;

import android.net.RouteInfo;

import android.net.LinkAddress;
@@ -50,15 +51,12 @@ public class VpnConfig implements Parcelable { 
        return intent;

    }



    public static PendingIntent getIntentForStatusPanel(Context context, VpnConfig config) {

        Preconditions.checkNotNull(config);



    public static PendingIntent getIntentForStatusPanel(Context context) {

        Intent intent = new Intent();

        intent.setClassName(DIALOGS_PACKAGE, DIALOGS_PACKAGE + ".ManageDialog");

        intent.putExtra("config", config);

        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_NO_HISTORY |

                Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);

        return PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_CANCEL_CURRENT);

        return PendingIntent.getActivityAsUser(context, 0, intent, 0, null, UserHandle.CURRENT);

    }



    public String user;

packages/VpnDialogs/src/com/android/vpndialogs/ManageDialog.java

+8 −1
Original line number Diff line number Diff line
@@ -65,11 +65,18 @@ public class ManageDialog extends AlertActivity implements 
        }



        try {

            mConfig = getIntent().getParcelableExtra("config");



            mService = IConnectivityManager.Stub.asInterface(

                    ServiceManager.getService(Context.CONNECTIVITY_SERVICE));



            mConfig = mService.getVpnConfig();



            // mConfig can be null if we are a restricted user, in that case don't show this dialog

            if (mConfig == null) {

                finish();

                return;

            }



            View view = View.inflate(this, R.layout.manage, null);

            if (mConfig.session != null) {

                ((TextView) view.findViewById(R.id.session)).setText(mConfig.session);

services/java/com/android/server/ConnectivityService.java

+14 −0
Original line number Diff line number Diff line
@@ -3425,6 +3425,20 @@ public class ConnectivityService extends IConnectivityManager.Stub { 
        }

    }



    /**

     * Returns the information of the ongoing VPN. This method is used by VpnDialogs and

     * not available in ConnectivityManager.

     * Permissions are checked in Vpn class.

     * @hide

     */

    @Override

    public VpnConfig getVpnConfig() {

        int user = UserHandle.getUserId(Binder.getCallingUid());

        synchronized(mVpns) {

            return mVpns.get(user).getVpnConfig();

        }

    }



    /**

     * Callback for VPN subsystem. Currently VPN is not adapted to the service

     * through NetworkStateTracker since it works differently. For example, it

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

+9 −1
Original line number Diff line number Diff line
@@ -519,6 +519,14 @@ public class Vpn extends BaseNetworkStateTracker { 
        }

    }



    /**

     * Return the configuration of the currently running VPN.

     */

    public VpnConfig getVpnConfig() {

        enforceControlPermission();

        return mConfig;

    }



    @Deprecated

    public synchronized void interfaceStatusChanged(String iface, boolean up) {

        try {
@@ -610,7 +618,7 @@ public class Vpn extends BaseNetworkStateTracker { 


    private void showNotification(String label, Bitmap icon, int user) {

        if (!mEnableNotif) return;

        mStatusIntent = VpnConfig.getIntentForStatusPanel(mContext, mConfig);

        mStatusIntent = VpnConfig.getIntentForStatusPanel(mContext);



        NotificationManager nm = (NotificationManager)

                mContext.getSystemService(Context.NOTIFICATION_SERVICE);