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

Commit d2a45875 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Map network identity using ConnectivityService. 

Instead of deriving network identity based on raw subsystem broadcasts,
listen for updates from ConnectivityService.  Added atomic view of all
active NetworkState, and build map from "iface" to NetworkIdentity set
for stats tracking.

To avoid exposing internal complexity, INetworkStatsService calls use
general templates.  Added TelephonyManager mapping to classify network
types using broad labels like "3G" or "4G", used to drive templates.

Cleaned up Objects and Preconditions.

Change-Id: I1d4c1403f0503bc3635a59bb378841ba42239a91
parent dd82b856

core/java/android/net/ConnectivityManager.java

+52 −1
Original line number Diff line number Diff line
@@ -256,10 +256,61 @@ public class ConnectivityManager { 


    private final IConnectivityManager mService;



    static public boolean isNetworkTypeValid(int networkType) {

    public static boolean isNetworkTypeValid(int networkType) {

        return networkType >= 0 && networkType <= MAX_NETWORK_TYPE;

    }



    /** {@hide} */

    public static String getNetworkTypeName(int type) {

        switch (type) {

            case TYPE_MOBILE:

                return "MOBILE";

            case TYPE_WIFI:

                return "WIFI";

            case TYPE_MOBILE_MMS:

                return "MOBILE_MMS";

            case TYPE_MOBILE_SUPL:

                return "MOBILE_SUPL";

            case TYPE_MOBILE_DUN:

                return "MOBILE_DUN";

            case TYPE_MOBILE_HIPRI:

                return "MOBILE_HIPRI";

            case TYPE_WIMAX:

                return "WIMAX";

            case TYPE_BLUETOOTH:

                return "BLUETOOTH";

            case TYPE_DUMMY:

                return "DUMMY";

            case TYPE_ETHERNET:

                return "ETHERNET";

            case TYPE_MOBILE_FOTA:

                return "MOBILE_FOTA";

            case TYPE_MOBILE_IMS:

                return "MOBILE_IMS";

            case TYPE_MOBILE_CBS:

                return "MOBILE_CBS";

            default:

                return Integer.toString(type);

        }

    }



    /** {@hide} */

    public static boolean isNetworkTypeMobile(int networkType) {

        switch (networkType) {

            case TYPE_MOBILE:

            case TYPE_MOBILE_MMS:

            case TYPE_MOBILE_SUPL:

            case TYPE_MOBILE_DUN:

            case TYPE_MOBILE_HIPRI:

            case TYPE_MOBILE_FOTA:

            case TYPE_MOBILE_IMS:

            case TYPE_MOBILE_CBS:

                return true;

            default:

                return false;

        }

    }



    public void setNetworkPreference(int preference) {

        try {

            mService.setNetworkPreference(preference);

core/java/android/net/IConnectivityManager.aidl

+3 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package android.net; 


import android.net.LinkProperties;

import android.net.NetworkInfo;

import android.net.NetworkState;

import android.net.ProxyProperties;

import android.os.IBinder;
@@ -40,6 +41,8 @@ interface IConnectivityManager 
    LinkProperties getActiveLinkProperties();

    LinkProperties getLinkProperties(int networkType);



    NetworkState[] getAllNetworkState();



    boolean setRadios(boolean onOff);



    boolean setRadio(int networkType, boolean turnOn);

core/java/android/net/INetworkStatsService.aidl

+8 −2
Original line number Diff line number Diff line
@@ -16,12 +16,18 @@ 


package android.net;



import android.net.NetworkStats;

import android.net.NetworkStatsHistory;



/** {@hide} */

interface INetworkStatsService {



    NetworkStatsHistory[] getNetworkStatsSummary(int networkType);

    NetworkStatsHistory getNetworkStatsUid(int uid);

    /** Return historical stats for traffic that matches template. */

    NetworkStatsHistory getHistoryForNetwork(int networkTemplate);

    /** Return historical stats for specific UID traffic that matches template. */

    NetworkStatsHistory getHistoryForUid(int uid, int networkTemplate);



    /** Return usage summary per UID for traffic that matches template. */

    NetworkStats getSummaryPerUid(long start, long end, int networkTemplate);



}

core/java/android/net/NetworkState.aidl

0 → 100644
+19 −0
Original line number Diff line number Diff line 
/**

 * Copyright (c) 2011, The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *     http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.net;



parcelable NetworkState;

core/java/android/net/NetworkState.java

0 → 100644
+68 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2011 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package android.net;



import android.os.Parcel;

import android.os.Parcelable;



/**

 * Snapshot of network state.

 *

 * @hide

 */

public class NetworkState implements Parcelable {



    public final NetworkInfo networkInfo;

    public final LinkProperties linkProperties;

    public final LinkCapabilities linkCapabilities;



    public NetworkState(NetworkInfo networkInfo, LinkProperties linkProperties,

            LinkCapabilities linkCapabilities) {

        this.networkInfo = networkInfo;

        this.linkProperties = linkProperties;

        this.linkCapabilities = linkCapabilities;

    }



    public NetworkState(Parcel in) {

        networkInfo = in.readParcelable(null);

        linkProperties = in.readParcelable(null);

        linkCapabilities = in.readParcelable(null);

    }



    /** {@inheritDoc} */

    public int describeContents() {

        return 0;

    }



    /** {@inheritDoc} */

    public void writeToParcel(Parcel out, int flags) {

        out.writeParcelable(networkInfo, flags);

        out.writeParcelable(linkProperties, flags);

        out.writeParcelable(linkCapabilities, flags);

    }



    public static final Creator<NetworkState> CREATOR = new Creator<NetworkState>() {

        public NetworkState createFromParcel(Parcel in) {

            return new NetworkState(in);

        }



        public NetworkState[] newArray(int size) {

            return new NetworkState[size];

        }

    };



}