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

Commit 5cde63a6 authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Android (Google) Code Review
Browse files

Merge "Add USB RNDIS enable/disable control"

parents 2e1818a4 65ae29bd

core/java/android/net/InterfaceConfiguration.java

+4 −4
Original line number Diff line number Diff line
@@ -45,10 +45,10 @@ public class InterfaceConfiguration implements Parcelable { 
    }



    private static void putAddress(StringBuffer buf, int addr) {

        buf.append(addr  & 0xff).append('.').

            append((addr >>>= 8) & 0xff).append('.').

            append((addr >>>= 8) & 0xff).append('.').

            append((addr >>>= 8) & 0xff);

        buf.append((addr >> 24) & 0xff).append('.').

            append((addr >> 16) & 0xff).append('.').

            append((addr >> 8) & 0xff).append('.').

            append(addr & 0xff);

    }



    /** Implement the Parcelable interface {@hide} */

services/java/com/android/server/NetworkManagementService.java

+2 −2
Original line number Diff line number Diff line
@@ -256,14 +256,14 @@ class NetworkManagementService extends INetworkManagementService.Stub { 
            Log.e(TAG, "Failed to parse netmask", uhe);

            cfg.netmask = 0;

        }

        cfg.interfaceFlags = st.nextToken("]");

        cfg.interfaceFlags = st.nextToken("]").trim() +"]";

        Log.d(TAG, String.format("flags <%s>", cfg.interfaceFlags));

        return cfg;

    }



    public void setInterfaceConfig(

            String iface, InterfaceConfiguration cfg) throws IllegalStateException {

        String cmd = String.format("interface setcfg %s %s %s", iface,

        String cmd = String.format("interface setcfg %s %s %s %s", iface,

                intToIpString(cfg.ipAddr), intToIpString(cfg.netmask), cfg.interfaceFlags);

        mConnector.doCommand(cmd);

    }

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

+230 −25

File changed.

Preview size limit exceeded, changes collapsed.

telephony/java/com/android/internal/telephony/DataConnectionTracker.java

+2 −1
Original line number Diff line number Diff line
@@ -444,6 +444,7 @@ public abstract class DataConnectionTracker extends Handler { 
                + isApnTypeActive(type) + " and state = " + state);



        if (!isApnTypeAvailable(type)) {

            if (DBG) Log.d(LOG_TAG, "type not available");

            return Phone.APN_TYPE_NOT_AVAILABLE;

        }