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

Commit 9e1aba45 authored by Chiachang Wang's avatar Chiachang Wang
Browse files

Add network created callback support 

Create a network callback to notify network agent after
netd has created the network, so that the NetworkAgent may
wait for this callback and ensure the pre-work to communicate
with netd completed.

Bug: 178725261
Test: make update-api
Change-Id: I8c2ff7bd6980ae838abc5669f9419d62741b8666
Merged-In: I8c2ff7bd6980ae838abc5669f9419d62741b8666
parent 2af1306a

packages/Connectivity/framework/api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -216,6 +216,7 @@ package android.net { 
    method public void markConnected();

    method public void onAddKeepalivePacketFilter(int, @NonNull android.net.KeepalivePacketData);

    method public void onAutomaticReconnectDisabled();

    method public void onNetworkCreated();

    method public void onNetworkUnwanted();

    method public void onQosCallbackRegistered(int, @NonNull android.net.QosFilter);

    method public void onQosCallbackUnregistered(int);

packages/Connectivity/framework/src/android/net/INetworkAgent.aidl

+1 −0
Original line number Diff line number Diff line
@@ -46,4 +46,5 @@ oneway interface INetworkAgent { 
    void onRemoveKeepalivePacketFilter(int slot);

    void onQosFilterCallbackRegistered(int qosCallbackId, in QosFilterParcelable filterParcel);

    void onQosCallbackUnregistered(int qosCallbackId);

    void onNetworkCreated();

}

packages/Connectivity/framework/src/android/net/NetworkAgent.java

+22 −0
Original line number Diff line number Diff line
@@ -362,6 +362,14 @@ public abstract class NetworkAgent { 
     */

    public static final int CMD_UNREGISTER_QOS_CALLBACK = BASE + 21;



    /**

     * Sent by ConnectivityService to {@link NetworkAgent} to inform the agent that its native

     * network was created and the Network object is now valid.

     *

     * @hide

     */

    public static final int CMD_NETWORK_CREATED = BASE + 22;



    private static NetworkInfo getLegacyNetworkInfo(final NetworkAgentConfig config) {

        // The subtype can be changed with (TODO) setLegacySubtype, but it starts

        // with 0 (TelephonyManager.NETWORK_TYPE_UNKNOWN) and an empty description.
@@ -563,6 +571,10 @@ public abstract class NetworkAgent { 
                            msg.arg1 /* QoS callback id */);

                    break;

                }

                case CMD_NETWORK_CREATED: {

                    onNetworkCreated();

                    break;

                }

            }

        }

    }
@@ -703,6 +715,11 @@ public abstract class NetworkAgent { 
            mHandler.sendMessage(mHandler.obtainMessage(

                    CMD_UNREGISTER_QOS_CALLBACK, qosCallbackId, 0, null));

        }



        @Override

        public void onNetworkCreated() {

            mHandler.sendMessage(mHandler.obtainMessage(CMD_NETWORK_CREATED));

        }

    }



    /**
@@ -1010,6 +1027,11 @@ public abstract class NetworkAgent { 
    protected void saveAcceptUnvalidated(boolean accept) {

    }



    /**

     * Called when ConnectivityService has successfully created this NetworkAgent's native network.

     */

    public void onNetworkCreated() {}



    /**

     * Requests that the network hardware send the specified packet at the specified interval.

     *

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

+1 −0
Original line number Diff line number Diff line
@@ -7964,6 +7964,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
                updateCapabilitiesForNetwork(networkAgent);

            }

            networkAgent.created = true;

            networkAgent.onNetworkCreated();

        }



        if (!networkAgent.everConnected && state == NetworkInfo.State.CONNECTED) {

services/core/java/com/android/server/connectivity/NetworkAgentInfo.java

+11 −0
Original line number Diff line number Diff line
@@ -577,6 +577,17 @@ public class NetworkAgentInfo implements Comparable<NetworkAgentInfo> { 
        }

    }



    /**

     * Notify the NetworkAgent that the network is successfully connected.

     */

    public void onNetworkCreated() {

        try {

            networkAgent.onNetworkCreated();

        } catch (RemoteException e) {

            Log.e(TAG, "Error sending network created event", e);

        }

    }



    // TODO: consider moving out of NetworkAgentInfo into its own class

    private class NetworkAgentMessageHandler extends INetworkAgentRegistry.Stub {

        private final Handler mHandler;