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

Commit 7e8dc868 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Replace com.android.internal.util.Preconditions.checkNotNull with... 

Merge "Replace com.android.internal.util.Preconditions.checkNotNull with java.util.Objects.requireNonNull" am: 605740e9 am: d5d37840

Change-Id: I4f4cc6289b598c5c2af24cc1b3d68dcc643c6d93
parents c22c3251 d5d37840

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

+10 −11
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package com.android.server;



import static com.android.internal.util.Preconditions.checkNotNull;



import android.annotation.NonNull;

import android.annotation.Nullable;

import android.content.Context;
@@ -55,6 +53,7 @@ import java.net.InterfaceAddress; 
import java.net.NetworkInterface;

import java.net.SocketException;

import java.util.ArrayList;

import java.util.Objects;

import java.util.concurrent.atomic.AtomicInteger;



/** @hide */
@@ -82,9 +81,9 @@ class TestNetworkService extends ITestNetworkManager.Stub { 
        mHandlerThread.start();

        mHandler = new Handler(mHandlerThread.getLooper());



        mContext = checkNotNull(context, "missing Context");

        mNMS = checkNotNull(netManager, "missing INetworkManagementService");

        mNetd = checkNotNull(NetdService.getInstance(), "could not get netd instance");

        mContext = Objects.requireNonNull(context, "missing Context");

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

        mNetd = Objects.requireNonNull(NetdService.getInstance(), "could not get netd instance");

    }



    /**
@@ -96,7 +95,7 @@ class TestNetworkService extends ITestNetworkManager.Stub { 
    private TestNetworkInterface createInterface(boolean isTun, LinkAddress[] linkAddrs) {

        enforceTestNetworkPermissions(mContext);



        checkNotNull(linkAddrs, "missing linkAddrs");

        Objects.requireNonNull(linkAddrs, "missing linkAddrs");



        String ifacePrefix = isTun ? TEST_TUN_PREFIX : TEST_TAP_PREFIX;

        String iface = ifacePrefix + sTestTunIndex.getAndIncrement();
@@ -233,8 +232,8 @@ class TestNetworkService extends ITestNetworkManager.Stub { 
            int callingUid,

            @NonNull IBinder binder)

            throws RemoteException, SocketException {

        checkNotNull(looper, "missing Looper");

        checkNotNull(context, "missing Context");

        Objects.requireNonNull(looper, "missing Looper");

        Objects.requireNonNull(context, "missing Context");

        // iface and binder validity checked by caller



        // Build network info with special testing type
@@ -267,7 +266,7 @@ class TestNetworkService extends ITestNetworkManager.Stub { 
        // Find the currently assigned addresses, and add them to LinkProperties

        boolean allowIPv4 = false, allowIPv6 = false;

        NetworkInterface netIntf = NetworkInterface.getByName(iface);

        checkNotNull(netIntf, "No such network interface found: " + netIntf);

        Objects.requireNonNull(netIntf, "No such network interface found: " + netIntf);



        for (InterfaceAddress intfAddr : netIntf.getInterfaceAddresses()) {

            lp.addLinkAddress(
@@ -305,8 +304,8 @@ class TestNetworkService extends ITestNetworkManager.Stub { 
            @NonNull IBinder binder) {

        enforceTestNetworkPermissions(mContext);



        checkNotNull(iface, "missing Iface");

        checkNotNull(binder, "missing IBinder");

        Objects.requireNonNull(iface, "missing Iface");

        Objects.requireNonNull(binder, "missing IBinder");



        if (!(iface.startsWith(INetd.IPSEC_INTERFACE_PREFIX)

                || iface.startsWith(TEST_TUN_PREFIX))) {