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

Commit 92b38ba2 authored by Paul Hu's avatar Paul Hu Committed by Automerger Merge Worker
Browse files

Merge "Replace INetworkPolicyManager to NetworkPolicyManager" am: 8918df04... 

Merge "Replace INetworkPolicyManager to NetworkPolicyManager" am: 8918df04 am: a3d3b58a am: 37daa95e

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id6685f26e6f7c7d9b0da6edd147f1aa37e16d676
parents b8498836 37daa95e

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

+8 −14
Original line number Diff line number Diff line
@@ -95,7 +95,6 @@ import android.net.INetworkManagementEventObserver; 
import android.net.INetworkMonitor;

import android.net.INetworkMonitorCallbacks;

import android.net.INetworkPolicyListener;

import android.net.INetworkPolicyManager;

import android.net.INetworkStatsService;

import android.net.ISocketKeepaliveCallback;

import android.net.InetAddresses;
@@ -337,7 +336,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
    @VisibleForTesting

    protected INetd mNetd;

    private INetworkStatsService mStatsService;

    private INetworkPolicyManager mPolicyManager;

    private NetworkPolicyManager mPolicyManager;

    private NetworkPolicyManagerInternal mPolicyManagerInternal;



    /**
@@ -946,15 +945,15 @@ public class ConnectivityService extends IConnectivityManager.Stub 
    }



    public ConnectivityService(Context context, INetworkManagementService netManager,

            INetworkStatsService statsService, INetworkPolicyManager policyManager) {

        this(context, netManager, statsService, policyManager, getDnsResolver(context),

                new IpConnectivityLog(), NetdService.getInstance(), new Dependencies());

            INetworkStatsService statsService) {

        this(context, netManager, statsService, getDnsResolver(context), new IpConnectivityLog(),

                NetdService.getInstance(), new Dependencies());

    }



    @VisibleForTesting

    protected ConnectivityService(Context context, INetworkManagementService netManager,

            INetworkStatsService statsService, INetworkPolicyManager policyManager,

            IDnsResolver dnsresolver, IpConnectivityLog logger, INetd netd, Dependencies deps) {

            INetworkStatsService statsService, IDnsResolver dnsresolver, IpConnectivityLog logger,

            INetd netd, Dependencies deps) {

        if (DBG) log("ConnectivityService starting up");



        mDeps = Objects.requireNonNull(deps, "missing Dependencies");
@@ -992,7 +991,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 


        mNMS = Objects.requireNonNull(netManager, "missing INetworkManagementService");

        mStatsService = Objects.requireNonNull(statsService, "missing INetworkStatsService");

        mPolicyManager = Objects.requireNonNull(policyManager, "missing INetworkPolicyManager");

        mPolicyManager = mContext.getSystemService(NetworkPolicyManager.class);

        mPolicyManagerInternal = Objects.requireNonNull(

                LocalServices.getService(NetworkPolicyManagerInternal.class),

                "missing NetworkPolicyManagerInternal");
@@ -1008,12 +1007,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        // To ensure uid rules are synchronized with Network Policy, register for

        // NetworkPolicyManagerService events must happen prior to NetworkPolicyManagerService

        // reading existing policy from disk.

        try {

        mPolicyManager.registerListener(mPolicyListener);

        } catch (RemoteException e) {

            // ouch, no rules updates means some processes may never get network

            loge("unable to register INetworkPolicyListener" + e);

        }



        final PowerManager powerManager = (PowerManager) context.getSystemService(

                Context.POWER_SERVICE);

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

+1 −8
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import static android.os.IServiceManager.DUMP_FLAG_PRIORITY_HIGH; 
import static android.os.IServiceManager.DUMP_FLAG_PRIORITY_NORMAL;



import android.content.Context;

import android.net.INetworkPolicyManager;

import android.net.INetworkStatsService;

import android.os.INetworkManagementService;

import android.os.ServiceManager;
@@ -38,7 +37,7 @@ public final class ConnectivityServiceInitializer extends SystemService { 
        super(context);

        // TODO: Define formal APIs to get the needed services.

        mConnectivity = new ConnectivityService(context, getNetworkManagementService(),

                getNetworkStatsService(), getNetworkPolicyManager());

                getNetworkStatsService());

    }



    @Override
@@ -57,10 +56,4 @@ public final class ConnectivityServiceInitializer extends SystemService { 
        return INetworkStatsService.Stub.asInterface(

                ServiceManager.getService(Context.NETWORK_STATS_SERVICE));

    }



    private INetworkPolicyManager getNetworkPolicyManager() {

        return INetworkPolicyManager.Stub.asInterface(

                ServiceManager.getService(Context.NETWORK_POLICY_SERVICE));

    }



}

tests/net/integration/src/com/android/server/net/integrationtests/ConnectivityServiceIntegrationTest.kt

+1 −4
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import android.content.ServiceConnection 
import android.net.ConnectivityManager

import android.net.IDnsResolver

import android.net.INetd

import android.net.INetworkPolicyManager

import android.net.INetworkStatsService

import android.net.LinkProperties

import android.net.NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL
@@ -88,8 +87,6 @@ class ConnectivityServiceIntegrationTest { 
    @Mock

    private lateinit var statsService: INetworkStatsService

    @Mock

    private lateinit var policyManager: INetworkPolicyManager

    @Mock

    private lateinit var log: IpConnectivityLog

    @Mock

    private lateinit var netd: INetd
@@ -171,7 +168,7 @@ class ConnectivityServiceIntegrationTest { 
    }



    private inner class TestConnectivityService(deps: Dependencies) : ConnectivityService(

            context, netManager, statsService, policyManager, dnsResolver, log, netd, deps)

            context, netManager, statsService, dnsResolver, log, netd, deps)



    private fun makeDependencies(): ConnectivityService.Dependencies {

        val deps = spy(ConnectivityService.Dependencies())

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

+4 −4
Original line number Diff line number Diff line
@@ -166,7 +166,6 @@ import android.net.INetd; 
import android.net.INetworkMonitor;

import android.net.INetworkMonitorCallbacks;

import android.net.INetworkPolicyListener;

import android.net.INetworkPolicyManager;

import android.net.INetworkStatsService;

import android.net.InetAddresses;

import android.net.InterfaceConfigurationParcel;
@@ -183,6 +182,7 @@ import android.net.NetworkCapabilities; 
import android.net.NetworkFactory;

import android.net.NetworkInfo;

import android.net.NetworkInfo.DetailedState;

import android.net.NetworkPolicyManager;

import android.net.NetworkRequest;

import android.net.NetworkSpecifier;

import android.net.NetworkStack;
@@ -365,7 +365,6 @@ public class ConnectivityServiceTest { 
    @Mock INetworkManagementService mNetworkManagementService;

    @Mock INetworkStatsService mStatsService;

    @Mock IBatteryStats mBatteryStatsService;

    @Mock INetworkPolicyManager mNpm;

    @Mock IDnsResolver mMockDnsResolver;

    @Mock INetd mMockNetd;

    @Mock NetworkStackClient mNetworkStack;
@@ -380,6 +379,7 @@ public class ConnectivityServiceTest { 
    @Mock TelephonyManager mTelephonyManager;

    @Mock MockableSystemProperties mSystemProperties;

    @Mock EthernetManager mEthernetManager;

    @Mock NetworkPolicyManager mNetworkPolicyManager;



    private ArgumentCaptor<ResolverParamsParcel> mResolverParamsParcelCaptor =

            ArgumentCaptor.forClass(ResolverParamsParcel.class);
@@ -477,6 +477,7 @@ public class ConnectivityServiceTest { 
            if (Context.APP_OPS_SERVICE.equals(name)) return mAppOpsManager;

            if (Context.TELEPHONY_SERVICE.equals(name)) return mTelephonyManager;

            if (Context.ETHERNET_SERVICE.equals(name)) return mEthernetManager;

            if (Context.NETWORK_POLICY_SERVICE.equals(name)) return mNetworkPolicyManager;

            return super.getSystemService(name);

        }
@@ -1326,7 +1327,6 @@ public class ConnectivityServiceTest { 
        mService = new ConnectivityService(mServiceContext,

                mNetworkManagementService,

                mStatsService,

                mNpm,

                mMockDnsResolver,

                mock(IpConnectivityLog.class),

                mMockNetd,
@@ -1336,7 +1336,7 @@ public class ConnectivityServiceTest { 


        final ArgumentCaptor<INetworkPolicyListener> policyListenerCaptor =

                ArgumentCaptor.forClass(INetworkPolicyListener.class);

        verify(mNpm).registerListener(policyListenerCaptor.capture());

        verify(mNetworkPolicyManager).registerListener(policyListenerCaptor.capture());

        mPolicyListener = policyListenerCaptor.getValue();



        // Create local CM before sending system ready so that we can answer