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

Commit 2d069c7f authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge "Add network disconnected callback" into sc-dev am: d41da280 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13992147

Change-Id: Ib97aeb1aa2884eba5c1fc09a99352bb2e7c6dd44
parents 7930e595 d41da280

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

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

    method public void onBandwidthUpdateRequested();

    method public void onNetworkCreated();

    method public void onNetworkDisconnected();

    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
@@ -47,4 +47,5 @@ oneway interface INetworkAgent { 
    void onQosFilterCallbackRegistered(int qosCallbackId, in QosFilterParcelable filterParcel);

    void onQosCallbackUnregistered(int qosCallbackId);

    void onNetworkCreated();

    void onNetworkDisconnected();

}

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

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

    public static final int CMD_NETWORK_CREATED = BASE + 22;



    /**

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

     * network was destroyed.

     *

     * @hide

     */

    public static final int CMD_NETWORK_DISCONNECTED = BASE + 23;



    private static NetworkInfo getLegacyNetworkInfo(final NetworkAgentConfig config) {

        final NetworkInfo ni = new NetworkInfo(config.legacyType, config.legacySubType,

                config.legacyTypeName, config.legacySubTypeName);
@@ -573,6 +581,10 @@ public abstract class NetworkAgent { 
                    onNetworkCreated();

                    break;

                }

                case CMD_NETWORK_DISCONNECTED: {

                    onNetworkDisconnected();

                    break;

                }

            }

        }

    }
@@ -718,6 +730,11 @@ public abstract class NetworkAgent { 
        public void onNetworkCreated() {

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

        }



        @Override

        public void onNetworkDisconnected() {

            mHandler.sendMessage(mHandler.obtainMessage(CMD_NETWORK_DISCONNECTED));

        }

    }



    /**
@@ -1032,6 +1049,12 @@ public abstract class NetworkAgent { 
     */

    public void onNetworkCreated() {}





    /**

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

     */

    public void onNetworkDisconnected() {}



    /**

     * 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
@@ -3716,6 +3716,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
            mDnsManager.removeNetwork(nai.network);

        }

        mNetIdManager.releaseNetId(nai.network.getNetId());

        nai.onNetworkDisconnected();

    }



    private boolean createNativeNetwork(@NonNull NetworkAgentInfo networkAgent) {

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

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

    }



    /**

     * Notify the NetworkAgent that the network is disconnected and destroyed.

     */

    public void onNetworkDisconnected() {

        try {

            networkAgent.onNetworkDisconnected();

        } catch (RemoteException e) {

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

        }

    }



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

    private class NetworkAgentMessageHandler extends INetworkAgentRegistry.Stub {

        private final Handler mHandler;