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

Commit 21c9c45e authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

Interface-level network policy, persist policies. 

Define NetworkPolicy as cycle-reset day and warning/limit values, and
set/get through NetworkPolicyManager.  Watch ConnectivityManager for
network connection events, and apply quota rules based on matching
interfaces.  Policy service matches based on strong identity to support
IMSI-specific policy values.

Calculates remaining quota based on current stats recorded since the
last reset cycle day.  Tests to verify edge cases around February.

Persist network and UID policies in XML, and restore on boot.

Change-Id: Id40ba7d6eed6094fbd5e18e6331286c606880d80
parent b505074e

core/java/android/net/INetworkPolicyManager.aidl

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



import android.net.INetworkPolicyListener;

import android.net.NetworkPolicy;



/**

 * Interface that creates and modifies network policy rules.
@@ -33,6 +34,7 @@ interface INetworkPolicyManager { 
    void registerListener(INetworkPolicyListener listener);

    void unregisterListener(INetworkPolicyListener listener);



    // TODO: build API to surface stats details for settings UI

    void setNetworkPolicy(int networkType, String subscriberId, in NetworkPolicy policy);

    NetworkPolicy getNetworkPolicy(int networkType, String subscriberId);



}

core/java/android/net/INetworkStatsService.aidl

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ interface INetworkStatsService { 
    /** Return historical stats for specific UID traffic that matches template. */

    NetworkStatsHistory getHistoryForUid(int uid, int networkTemplate);



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

    NetworkStats getSummaryForNetwork(long start, long end, int networkTemplate, String subscriberId);

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

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

core/java/android/net/NetworkPolicy.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 NetworkPolicy;

core/java/android/net/NetworkPolicy.java

0 → 100644
+81 −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;



/**

 * Policy for a specific network, including usage cycle and limits to be

 * enforced.

 *

 * @hide

 */

public class NetworkPolicy implements Parcelable, Comparable<NetworkPolicy> {

    public final int cycleDay;

    public final long warningBytes;

    public final long limitBytes;



    public NetworkPolicy(int cycleDay, long warningBytes, long limitBytes) {

        this.cycleDay = cycleDay;

        this.warningBytes = warningBytes;

        this.limitBytes = limitBytes;

    }



    public NetworkPolicy(Parcel in) {

        cycleDay = in.readInt();

        warningBytes = in.readLong();

        limitBytes = in.readLong();

    }



    /** {@inheritDoc} */

    public void writeToParcel(Parcel dest, int flags) {

        dest.writeInt(cycleDay);

        dest.writeLong(warningBytes);

        dest.writeLong(limitBytes);

    }



    /** {@inheritDoc} */

    public int describeContents() {

        return 0;

    }



    /** {@inheritDoc} */

    public int compareTo(NetworkPolicy another) {

        if (another == null || limitBytes < another.limitBytes) {

            return -1;

        } else {

            return 1;

        }

    }



    @Override

    public String toString() {

        return "NetworkPolicy: cycleDay=" + cycleDay + ", warningBytes=" + warningBytes

                + ", limitBytes=" + limitBytes;

    }



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

        public NetworkPolicy createFromParcel(Parcel in) {

            return new NetworkPolicy(in);

        }



        public NetworkPolicy[] newArray(int size) {

            return new NetworkPolicy[size];

        }

    };

}

core/java/android/net/NetworkPolicyManager.java

+17 −0
Original line number Diff line number Diff line
@@ -51,6 +51,23 @@ public class NetworkPolicyManager { 
        return (NetworkPolicyManager) context.getSystemService(Context.NETWORK_POLICY_SERVICE);

    }



    /** {@hide} */

    public void setNetworkPolicy(int networkType, String subscriberId, NetworkPolicy policy) {

        try {

            mService.setNetworkPolicy(networkType, subscriberId, policy);

        } catch (RemoteException e) {

        }

    }



    /** {@hide} */

    public NetworkPolicy getNetworkPolicy(int networkType, String subscriberId) {

        try {

            return mService.getNetworkPolicy(networkType, subscriberId);

        } catch (RemoteException e) {

            return null;

        }

    }



    /**

     * Set policy flags for specific UID.

     *