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

Commit 5d2479d1 authored by Ricardo Cerqueira's avatar Ricardo Cerqueira
Browse files

Revert "Vpn: Setup routes." 

This reverts commit 93f9ebe4. It
is incompatible with change I5b2bde0ac5459433fc5749f509072a548532f730
and breaks routing on 4.4.3

Change-Id: I6e730ae66c7a5fdca582cc8c05f13ea8b234d848
parent 02d36159

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

+0 −17
Original line number Diff line number Diff line
@@ -372,16 +372,6 @@ public class Vpn extends BaseNetworkStateTracker { 
            if (jniSetAddresses(interfaze, builder.toString()) < 1) {

                throw new IllegalArgumentException("At least one address must be specified");

            }



            if (config.routes != null) {

                builder = new StringBuilder();

                for (RouteInfo route : config.routes) {

                    String[] split = route.toString().split("->");

                    builder.append(" " + split[0].trim());

                }

                jniSetRoutes(interfaze, builder.toString());

            }



            Connection connection = new Connection();

            if (!mContext.bindServiceAsUser(intent, connection, Context.BIND_AUTO_CREATE,

                        new UserHandle(mUserId))) {
@@ -1141,13 +1131,6 @@ public class Vpn extends BaseNetworkStateTracker { 
                }



                // Set the routes.

                StringBuilder builder = new StringBuilder();

                for (RouteInfo route : mConfig.routes) {

                    String[] split = route.toString().split("->");

                    builder.append(" " + split[0].trim());

                }

                jniSetRoutes(mConfig.interfaze, builder.toString());



                long token = Binder.clearCallingIdentity();

                try {

                    mCallback.setMarkedForwarding(mConfig.interfaze);