Merge "Move LocationPermissionChecker to libs/net" am: 73783aae63 am: a81bc09265 am: 1af5906ebf
Original change: https://android-review.googlesource.com/c/platform/frameworks/libs/net/+/1618685
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7ba5e213e32c9d9c280a4fffc7a6217160ee58ee
diff --git a/staticlibs/devicetests/com/android/testutils/CompatUtil.kt b/staticlibs/devicetests/com/android/testutils/CompatUtil.kt
index 4bb90a8..ff8c668 100644
--- a/staticlibs/devicetests/com/android/testutils/CompatUtil.kt
+++ b/staticlibs/devicetests/com/android/testutils/CompatUtil.kt
@@ -27,7 +27,7 @@
fun makeTestNetworkSpecifier(ifName: String): NetworkSpecifier {
// Until R, there was no TestNetworkSpecifier, StringNetworkSpecifier was used instead
if (isDevSdkInRange(minExclusive = null, maxInclusive = Build.VERSION_CODES.R)) {
- makeNetworkSpecifierInternal("android.net.StringNetworkSpecifier", ifName)
+ return makeNetworkSpecifierInternal("android.net.StringNetworkSpecifier", ifName)
}
// TestNetworkSpecifier is not part of the SDK in some branches using this utility
// TODO: replace with a direct call to the constructor
@@ -38,7 +38,7 @@
fun makeEthernetNetworkSpecifier(ifName: String): NetworkSpecifier {
// Until R, there was no EthernetNetworkSpecifier, StringNetworkSpecifier was used instead
if (isDevSdkInRange(minExclusive = null, maxInclusive = Build.VERSION_CODES.R)) {
- makeNetworkSpecifierInternal("android.net.StringNetworkSpecifier", ifName)
+ return makeNetworkSpecifierInternal("android.net.StringNetworkSpecifier", ifName)
}
// EthernetNetworkSpecifier is not part of the SDK in some branches using this utility
// TODO: replace with a direct call to the constructor