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

Commit 8495b1b1 authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge "[IT4.2] Update argument type of interfaceClassDataActivityChanged" am: dcb40511 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I579829d0a152de56ce23ec15aa8a8f26538a9de7
parents 55651186 dcb40511

core/java/android/net/INetworkManagementEventObserver.aidl

+2 −2
Original line number Diff line number Diff line
@@ -85,14 +85,14 @@ oneway interface INetworkManagementEventObserver { 
    /**

     * Interface data activity status is changed.

     *

     * @param label Unique identifier indicates the network type of the data activity change.

     * @param networkType The legacy network type of the data activity change.

     * @param active  True if the interface is actively transmitting data, false if it is idle.

     * @param tsNanos Elapsed realtime in nanos when the state of the network interface changed.

     * @param uid Uid of this event. It represents the uid that was responsible for waking the

     *            radio. For those events that are reported by system itself, not from specific uid,

     *            use -1 for the events which means no uid.

     */

    void interfaceClassDataActivityChanged(String label, boolean active, long tsNanos, int uid);

    void interfaceClassDataActivityChanged(int networkType, boolean active, long tsNanos, int uid);



    /**

     * Information about available DNS servers has been received.

core/java/com/android/server/net/BaseNetworkObserver.java

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ public class BaseNetworkObserver extends INetworkManagementEventObserver.Stub { 
    }



    @Override

    public void interfaceClassDataActivityChanged(String label, boolean active, long tsNanos,

    public void interfaceClassDataActivityChanged(int networkType, boolean active, long tsNanos,

            int uid) {

        // default no-op

    }

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

+2 −3
Original line number Diff line number Diff line
@@ -1792,10 +1792,9 @@ public class ConnectivityService extends IConnectivityManager.Stub 


    private INetworkManagementEventObserver mDataActivityObserver = new BaseNetworkObserver() {

        @Override

        public void interfaceClassDataActivityChanged(String label, boolean active, long tsNanos,

        public void interfaceClassDataActivityChanged(int networkType, boolean active, long tsNanos,

                int uid) {

            int deviceType = Integer.parseInt(label);

            sendDataActivityBroadcast(deviceType, active, tsNanos);

            sendDataActivityBroadcast(networkType, active, tsNanos);

        }

    };

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

+1 −1
Original line number Diff line number Diff line
@@ -423,7 +423,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub { 


        final boolean active = isActive;

        invokeForAllObservers(o -> o.interfaceClassDataActivityChanged(

                Integer.toString(type), active, tsNanos, uid));

                type, active, tsNanos, uid));



        boolean report = false;

        synchronized (mIdleTimerLock) {

tests/net/java/com/android/server/NetworkManagementServiceTest.java

+3 −3
Original line number Diff line number Diff line
@@ -167,13 +167,13 @@ public class NetworkManagementServiceTest { 
         * Interface class activity.

         */

        unsolListener.onInterfaceClassActivityChanged(true, 1, 1234, TEST_UID);

        expectSoon(observer).interfaceClassDataActivityChanged("1", true, 1234, TEST_UID);

        expectSoon(observer).interfaceClassDataActivityChanged(1, true, 1234, TEST_UID);



        unsolListener.onInterfaceClassActivityChanged(false, 9, 5678, TEST_UID);

        expectSoon(observer).interfaceClassDataActivityChanged("9", false, 5678, TEST_UID);

        expectSoon(observer).interfaceClassDataActivityChanged(9, false, 5678, TEST_UID);



        unsolListener.onInterfaceClassActivityChanged(false, 9, 4321, TEST_UID);

        expectSoon(observer).interfaceClassDataActivityChanged("9", false, 4321, TEST_UID);

        expectSoon(observer).interfaceClassDataActivityChanged(9, false, 4321, TEST_UID);



        /**

         * IP address changes.