From d59af18458ee823d2a9b4e61dc9eb79e87bfdbc5 Mon Sep 17 00:00:00 2001 From: Chalard Jean Date: Fri, 28 Aug 2020 16:54:40 +0900 Subject: [PATCH] Remove backward compatibility flag Kotlin updates to 1.4 and fixes an issue where @JvmOverload methods were not final. See https://kotlinlang.org/docs/reference/compatibility-guide-14.html#generated-overloads-for-jvmoverloads-on-open-methods-should-be-final Remove the backward compatibility flag by special-casing the method that needs to be overridden at this time, which gets rid of the local concern. Bug: 166499531 Test: Builds, atest ConnectivityServiceTest Change-Id: Ia13c67876f99dafd77d890e82d62453713b7b5fe --- staticlibs/Android.bp | 3 --- .../com/android/testutils/TestableNetworkCallback.kt | 7 +++++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/staticlibs/Android.bp b/staticlibs/Android.bp index 1143e05bfb..f4799f0c50 100644 --- a/staticlibs/Android.bp +++ b/staticlibs/Android.bp @@ -102,9 +102,6 @@ java_library { "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 959a837d4a..3c038fa420 100644 --- a/staticlibs/devicetests/com/android/testutils/TestableNetworkCallback.kt +++ b/staticlibs/devicetests/com/android/testutils/TestableNetworkCallback.kt @@ -170,8 +170,11 @@ open class TestableNetworkCallback private constructor( } // 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") }