joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Fix merge conflict."

Browse source
This commit is contained in:
Lorenzo Colitti 2021-02-18 05:22:56 +00:00 • committed by Gerrit Code Review
commit 8e97e8b968
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/net/java/com/android/server/connectivity/NetworkNotificationManagerTest.java
View file

@ -46,7 +46,9 @@ import androidx.test.runner.AndroidJUnit4;
import com.android.internal.R;
import com.android.server.connectivity.NetworkNotificationManager.NotificationType;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.AdditionalAnswers;