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

Commit 5926cab6 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 6897674 from 3e710136 to sc-d1-release 

Change-Id: I902bb4388a8f29a8255e02ec991134caed3fad15
parents acbea208 3e710136

tests/integration/src/android/net/ip/IpClientIntegrationTestCommon.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -120,7 +120,6 @@ import android.net.shared.Layer2Information; 
import android.net.shared.ProvisioningConfiguration;

import android.net.shared.ProvisioningConfiguration;

import android.net.shared.ProvisioningConfiguration.ScanResultInfo;

import android.net.shared.ProvisioningConfiguration.ScanResultInfo;

import android.net.util.InterfaceParams;

import android.net.util.InterfaceParams;

import android.net.util.IpUtils;

import android.net.util.NetworkStackUtils;

import android.net.util.NetworkStackUtils;

import android.os.Build;

import android.os.Build;

import android.os.Handler;

import android.os.Handler;
@@ -141,6 +140,7 @@ import androidx.test.runner.AndroidJUnit4; 




import com.android.internal.util.StateMachine;

import com.android.internal.util.StateMachine;

import com.android.net.module.util.ArrayTrackRecord;

import com.android.net.module.util.ArrayTrackRecord;

import com.android.net.module.util.IpUtils;

import com.android.networkstack.apishim.CaptivePortalDataShimImpl;

import com.android.networkstack.apishim.CaptivePortalDataShimImpl;

import com.android.networkstack.apishim.ConstantsShim;

import com.android.networkstack.apishim.ConstantsShim;

import com.android.networkstack.apishim.common.ShimUtils;

import com.android.networkstack.apishim.common.ShimUtils;