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

Commit db85a337 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "services.net: Use the new ModuleNetworkStackClient" am: fdf46978 

Change-Id: I97918b59b98a76267935680ceae19881f5f42e7b
parents 9ac51769 fdf46978

services/net/java/android/net/IpMemoryStore.java

+4 −3
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package android.net; 


import android.annotation.NonNull;

import android.content.Context;

import android.net.networkstack.ModuleNetworkStackClient;

import android.util.Log;



import com.android.internal.annotations.VisibleForTesting;
@@ -41,7 +42,7 @@ public class IpMemoryStore extends IpMemoryStoreClient { 
        super(context);

        mService = new CompletableFuture<>();

        mTailNode = new AtomicReference<CompletableFuture<IIpMemoryStore>>(mService);

        getNetworkStackClient().fetchIpMemoryStore(

        getModuleNetworkStackClient(context).fetchIpMemoryStore(

                new IIpMemoryStoreCallbacks.Stub() {

                    @Override

                    public void onIpMemoryStoreFetched(@NonNull final IIpMemoryStore memoryStore) {
@@ -85,8 +86,8 @@ public class IpMemoryStore extends IpMemoryStoreClient { 
    }



    @VisibleForTesting

    protected NetworkStackClient getNetworkStackClient() {

        return NetworkStackClient.getInstance();

    protected ModuleNetworkStackClient getModuleNetworkStackClient(Context context) {

        return ModuleNetworkStackClient.getInstance(context);

    }



    /** Gets an instance of the memory store */

services/net/java/android/net/ip/IpClientUtil.java

+4 −4
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import android.content.Context; 
import android.net.DhcpResultsParcelable;

import android.net.Layer2PacketParcelable;

import android.net.LinkProperties;

import android.net.NetworkStackClient;

import android.net.networkstack.ModuleNetworkStackClient;

import android.os.ConditionVariable;



import java.io.FileDescriptor;
@@ -75,11 +75,11 @@ public class IpClientUtil { 
     *

     * <p>This is a convenience method to allow clients to use {@link IpClientCallbacks} instead of

     * {@link IIpClientCallbacks}.

     * @see {@link NetworkStackClient#makeIpClient(String, IIpClientCallbacks)}

     * @see {@link ModuleNetworkStackClient#makeIpClient(String, IIpClientCallbacks)}

     */

    public static void makeIpClient(Context context, String ifName, IpClientCallbacks callback) {

        // TODO: migrate clients and remove context argument

        NetworkStackClient.getInstance().makeIpClient(ifName, new IpClientCallbacksProxy(callback));

        ModuleNetworkStackClient.getInstance(context)

                .makeIpClient(ifName, new IpClientCallbacksProxy(callback));

    }



    /**

tests/net/java/android/net/IpMemoryStoreTest.java

+6 −5
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import android.net.ipmemorystore.IOnStatusListener; 
import android.net.ipmemorystore.NetworkAttributes;

import android.net.ipmemorystore.NetworkAttributesParcelable;

import android.net.ipmemorystore.Status;

import android.net.networkstack.ModuleNetworkStackClient;

import android.os.RemoteException;



import androidx.test.filters.SmallTest;
@@ -67,7 +68,7 @@ public class IpMemoryStoreTest { 
    @Mock

    Context mMockContext;

    @Mock

    NetworkStackClient mNetworkStackClient;

    ModuleNetworkStackClient mModuleNetworkStackClient;

    @Mock

    IIpMemoryStore mMockService;

    @Mock
@@ -90,14 +91,14 @@ public class IpMemoryStoreTest { 
                ((IIpMemoryStoreCallbacks) invocation.getArgument(0))

                        .onIpMemoryStoreFetched(mMockService);

                return null;

            }).when(mNetworkStackClient).fetchIpMemoryStore(any());

            }).when(mModuleNetworkStackClient).fetchIpMemoryStore(any());

        } else {

            doNothing().when(mNetworkStackClient).fetchIpMemoryStore(mCbCaptor.capture());

            doNothing().when(mModuleNetworkStackClient).fetchIpMemoryStore(mCbCaptor.capture());

        }

        mStore = new IpMemoryStore(mMockContext) {

            @Override

            protected NetworkStackClient getNetworkStackClient() {

                return mNetworkStackClient;

            protected ModuleNetworkStackClient getModuleNetworkStackClient(Context ctx) {

                return mModuleNetworkStackClient;

            }

        };

    }