LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Rename Kotlin util files to not include the Kt suffix" am: 6a8da60a32 am: 97cda73a1c

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1350084

Change-Id: I6362695120ea8669e1da84bb686e886b85efd6a3
This commit is contained in:
Chalard Jean
2020-08-13 04:26:11 +00:00
committed by Automerger Merge Worker
parent 148be57009 97cda73a1c
commit 97c4e1a647
21 changed files with 73 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/net/java/android/net/ConnectivityDiagnosticsManagerTest.java
View File

@@ -21,7 +21,7 @@ import static android.net.ConnectivityDiagnosticsManager.ConnectivityDiagnostics
import static android.net.ConnectivityDiagnosticsManager.ConnectivityReport;
import static android.net.ConnectivityDiagnosticsManager.DataStallReport;
import static com.android.testutils.ParcelUtilsKt.assertParcelSane;
import static com.android.testutils.ParcelUtils.assertParcelSane;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;

4
tests/net/java/android/net/IpSecConfigTest.java
View File

@@ -16,8 +16,8 @@
package android.net;
import static com.android.testutils.ParcelUtilsKt.assertParcelSane;
import static com.android.testutils.ParcelUtilsKt.assertParcelingIsLossless;
import static com.android.testutils.ParcelUtils.assertParcelSane;
import static com.android.testutils.ParcelUtils.assertParcelingIsLossless;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotSame;

2
tests/net/java/android/net/TcpKeepalivePacketDataTest.java
View File

@@ -16,7 +16,7 @@
package android.net;
import static com.android.testutils.ParcelUtilsKt.assertParcelingIsLossless;
import static com.android.testutils.ParcelUtils.assertParcelingIsLossless;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;

2
tests/net/java/android/net/TelephonyNetworkSpecifierTest.java
View File

@@ -16,7 +16,7 @@
package android.net;
import static com.android.testutils.ParcelUtilsKt.assertParcelSane;
import static com.android.testutils.ParcelUtils.assertParcelSane;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;

6
tests/net/java/android/net/nsd/NsdManagerTest.java
View File

@@ -38,7 +38,7 @@ import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4;
import com.android.internal.util.AsyncChannel;
import com.android.testutils.HandlerUtilsKt;
import com.android.testutils.HandlerUtils;
import org.junit.After;
import org.junit.Before;
@@ -73,7 +73,7 @@ public class NsdManagerTest {
@After
public void tearDown() throws Exception {
HandlerUtilsKt.waitForIdle(mServiceHandler, mTimeoutMs);
HandlerUtils.waitForIdle(mServiceHandler, mTimeoutMs);
mServiceHandler.chan.disconnect();
mServiceHandler.stop();
if (mManager != null) {
@@ -333,7 +333,7 @@ public class NsdManagerTest {
}
int verifyRequest(int expectedMessageType) {
HandlerUtilsKt.waitForIdle(mServiceHandler, mTimeoutMs);
HandlerUtils.waitForIdle(mServiceHandler, mTimeoutMs);
verify(mServiceHandler, timeout(mTimeoutMs)).handleMessage(any());
reset(mServiceHandler);
Message received = mServiceHandler.getLastMessage();