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

Commit 37902967 authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by android-build-merger
Browse files

Merge changes from topic "netd-event-listener-aidl" 

am: 481251a0

Change-Id: I6ee2f333c2d68c8542070f48ffac83d38e36d217
parents e603fe8b 481251a0

Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -653,7 +653,6 @@ java_defaults { 
            "frameworks/av/media/libaudioclient/aidl",

            "frameworks/native/aidl/gui",

            "system/core/storaged/binder",

            "system/netd/server/binder",

            "system/vold/binder",

            "system/bt/binder",

            "system/security/keystore/binder",

core/java/android/os/INetworkManagementService.aidl

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



import android.net.InterfaceConfiguration;

import android.net.INetd;

import android.net.INetworkManagementEventObserver;

import android.net.ITetheringStatsProvider;

import android.net.Network;
@@ -46,11 +45,6 @@ interface INetworkManagementService 
     */

    void unregisterObserver(INetworkManagementEventObserver obs);



    /**

     * Retrieve an INetd to talk to netd.

     */

    INetd getNetdService();



    /**

     * Returns a list of currently known network interfaces

     */

services/core/Android.bp

+1 −2
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ java_library_static { 
            "frameworks/native/aidl/binder",

            "frameworks/native/cmds/dumpstate/binder",

            "system/core/storaged/binder",

            "system/netd/server/binder",

            "system/vold/binder",

        ],

    },
@@ -19,7 +18,6 @@ java_library_static { 
        ":mediaupdateservice_aidl",

        "java/com/android/server/EventLogTags.logtags",

        "java/com/android/server/am/EventLogTags.logtags",

        ":netd_metrics_aidl",

    ],



    libs: [
@@ -49,6 +47,7 @@ java_library_static { 
        "android.hardware.contexthub-V1.0-java",

        "android.hidl.manager-V1.0-java",

        "netd_aidl_interface-java",

        "netd_event_listener_interface-java",

    ],

}

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

+0 −12
Original line number Diff line number Diff line
@@ -950,18 +950,6 @@ public class NetworkManagementService extends INetworkManagementService.Stub 
    //

    // INetworkManagementService members

    //

    @Override

    public INetd getNetdService() throws RemoteException {

        final CountDownLatch connectedSignal = mConnectedSignal;

        if (connectedSignal != null) {

            try {

                connectedSignal.await();

            } catch (InterruptedException ignored) {}

        }



        return mNetdService;

    }



    @Override

    public String[] listInterfaces() {

        mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG);