Remove backward compatibility flag am: d1bedc4e64
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1413548
Change-Id: Idf1c2240e631e3cb132c19c7063deea945764b33
diff --git a/staticlibs/Android.bp b/staticlibs/Android.bp
index 1143e05..f4799f0 100644
--- a/staticlibs/Android.bp
+++ b/staticlibs/Android.bp
@@ -102,9 +102,6 @@
"net-tests-utils-host-device-common",
"net-utils-device-common",
],
- kotlincflags: [
- "-XXLanguage:-GenerateJvmOverloadsAsFinal"
- ]
}
filegroup {
diff --git a/staticlibs/devicetests/com/android/testutils/TestableNetworkCallback.kt b/staticlibs/devicetests/com/android/testutils/TestableNetworkCallback.kt
index 959a837..3c038fa 100644
--- a/staticlibs/devicetests/com/android/testutils/TestableNetworkCallback.kt
+++ b/staticlibs/devicetests/com/android/testutils/TestableNetworkCallback.kt
@@ -170,8 +170,11 @@
}
// Make open for use in ConnectivityServiceTest which is the only one knowing its handlers.
- @JvmOverloads
- open fun assertNoCallback(timeoutMs: Long = defaultTimeoutMs) {
+ // TODO : remove the necessity to overload this, remove the open qualifier, and give a
+ // default argument to assertNoCallback instead, possibly with @JvmOverloads if necessary.
+ open fun assertNoCallback() = assertNoCallback(defaultTimeoutMs)
+
+ fun assertNoCallback(timeoutMs: Long) {
val cb = history.poll(timeoutMs)
if (null != cb) fail("Expected no callback but got $cb")
}