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

Commit 7d0e392e authored by Lorenzo Colitti's avatar Lorenzo Colitti Committed by Android (Google) Code Review
Browse files

Merge changes Idf0cfee8,I27307e2e into nyc-dev 

* changes:
  Use native netd binder interface in NetworkManagementService.
  Fix IdleableHandlerThread.
parents 4b187acf 58967baf

services/core/Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -7,7 +7,8 @@ LOCAL_MODULE := services.core 
LOCAL_SRC_FILES += \

    $(call all-java-files-under,java) \

    java/com/android/server/EventLogTags.logtags \

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

    java/com/android/server/am/EventLogTags.logtags \

    ../../../../system/netd/server/binder/android/net/INetd.aidl



LOCAL_JAVA_LIBRARIES := services.net telephony-common

LOCAL_STATIC_JAVA_LIBRARIES := tzdata_update

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

+14 −2
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ import android.annotation.NonNull; 
import android.app.ActivityManagerNative;

import android.content.Context;

import android.net.ConnectivityManager;

import android.net.INetd;

import android.net.INetworkManagementEventObserver;

import android.net.InterfaceConfiguration;

import android.net.IpPrefix;
@@ -122,7 +123,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub 
    private static final String TAG = "NetworkManagement";

    private static final boolean DBG = Log.isLoggable(TAG, Log.DEBUG);

    private static final String NETD_TAG = "NetdConnector";

    private static final String NETD_SOCKET_NAME = "netd";

    private static final String NETD_SERVICE_NAME = "netd";



    private static final int MAX_UID_RANGES_PER_COMMAND = 10;
@@ -188,6 +189,8 @@ public class NetworkManagementService extends INetworkManagementService.Stub 
    private final Handler mFgHandler;

    private final Handler mDaemonHandler;



    private INetd mNetdService;



    private IBatteryStats mBatteryStats;



    private final Thread mThread;
@@ -306,7 +309,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub 
    }



    public static NetworkManagementService create(Context context) throws InterruptedException {

        return create(context, NETD_SOCKET_NAME);

        return create(context, NETD_SERVICE_NAME);

    }



    public void systemReady() {
@@ -515,6 +518,15 @@ public class NetworkManagementService extends INetworkManagementService.Stub 
     * existing in-memory rules.

     */

    private void prepareNativeDaemon() {

        boolean nativeServiceAvailable = false;

        try {

            mNetdService = INetd.Stub.asInterface(ServiceManager.getService(NETD_SERVICE_NAME));

            nativeServiceAvailable = mNetdService.isAlive();

        } catch (RemoteException e) {}

        if (!nativeServiceAvailable) {

            Slog.wtf(TAG, "Can't connect to NativeNetdService " + NETD_SERVICE_NAME);

        }



        mBandwidthControlEnabled = false;



        // only enable bandwidth control when support exists

services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java

+5 −3
Original line number Diff line number Diff line
@@ -161,10 +161,12 @@ public class ConnectivityServiceTest extends AndroidTestCase { 
                assertNull("BUG: only one idle handler allowed", mIdleHandler);

                mIdleHandler = new IdleHandler() {

                    public boolean queueIdle() {

                        synchronized (queue) {

                            cv.open();

                            mIdleHandler = null;

                            return false;  // Remove the handler.

                        }

                    }

                };

                queue.addIdleHandler(mIdleHandler);

            }