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

Commit e5ff9346 authored by Andreas Gampe's avatar Andreas Gampe
Browse files

Fix merge commit 

Follow-up to commit a2640b6f

Test: mmma frameworks/base/tests/net
Change-Id: I5cdc873f6d0d0c39c8e0b38cd04c16fd16a47cbf
parent be8e056d

tests/net/java/com/android/server/connectivity/TetheringTest.java

+3 −0
Original line number Original line Diff line number Diff line
@@ -45,6 +45,7 @@ import static org.mockito.Mockito.times; 
import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.verifyNoMoreInteractions;

import static org.mockito.Mockito.verifyNoMoreInteractions;

import static org.mockito.Mockito.when;

import static org.mockito.Mockito.when;

import static org.mockito.Mockito.mock;





import android.content.BroadcastReceiver;

import android.content.BroadcastReceiver;

import android.content.ContentResolver;

import android.content.ContentResolver;
@@ -75,12 +76,14 @@ import android.net.util.NetworkConstants; 
import android.net.util.SharedLog;

import android.net.util.SharedLog;

import android.net.wifi.WifiConfiguration;

import android.net.wifi.WifiConfiguration;

import android.net.wifi.WifiManager;

import android.net.wifi.WifiManager;

import android.os.Bundle;

import android.os.Handler;

import android.os.Handler;

import android.os.INetworkManagementService;

import android.os.INetworkManagementService;

import android.os.PersistableBundle;

import android.os.PersistableBundle;

import android.os.RemoteException;

import android.os.RemoteException;

import android.os.test.TestLooper;

import android.os.test.TestLooper;

import android.os.UserHandle;

import android.os.UserHandle;

import android.os.UserManager;

import android.provider.Settings;

import android.provider.Settings;

import android.support.test.filters.SmallTest;

import android.support.test.filters.SmallTest;

import android.support.test.runner.AndroidJUnit4;

import android.support.test.runner.AndroidJUnit4;