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 "Remove @JvmSerializableLambda usage in CarrierConfigRule" into main

Browse source
This commit is contained in:
Quang Luong 2025-04-17 15:04:06 -07:00 • committed by Android (Google) Code Review
commit f0a44a9a23
1 changed files with 12 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

42
staticlibs/testutils/devicetests/com/android/testutils/CarrierConfigRule.kt
View file

@ -180,15 +180,9 @@ class CarrierConfigRule : TestRule {
val tm = context.getSystemService(TelephonyManager::class.java)!!
val cpb = PrivilegeWaiterCallback()
// The lambda below is capturing |cpb|, whose type inherits from a class that appeared in
// T. This means the lambda will compile as a private method of this class taking a
// PrivilegeWaiterCallback argument. As JUnit uses reflection to enumerate all methods
// including private methods, this would fail with a link error when running on S-.
// To solve this, make the lambda serializable, which causes the compiler to emit a
// synthetic class instead of a synthetic method.
tryTest @JvmSerializableLambda {
tryTest {
val slotIndex = SubscriptionManager.getSlotIndex(subId)!!
runAsShell(READ_PRIVILEGED_PHONE_STATE) @JvmSerializableLambda {
runAsShell(READ_PRIVILEGED_PHONE_STATE) {
tm.registerCarrierPrivilegesCallback(slotIndex, { it.run() }, cpb)
}
val currentPrivilege = cpb.expectCarrierPrivilegesChanged()
@ -212,8 +206,8 @@ class CarrierConfigRule : TestRule {
cleanUpNow()
}
cpb.eventuallyExpectCarrierPrivilegesChanged(hold)
} cleanup @JvmSerializableLambda {
runAsShell(READ_PRIVILEGED_PHONE_STATE) @JvmSerializableLambda {
} cleanup {
runAsShell(READ_PRIVILEGED_PHONE_STATE) {
tm.unregisterCarrierPrivilegesCallback(cpb)
}
}
@ -259,15 +253,9 @@ class CarrierConfigRule : TestRule {
val cv = ConditionVariable()
val cpb = CarrierServiceChangedWaiterCallback(cv)
// The lambda below is capturing |cpb|, whose type inherits from a class that appeared in
// T. This means the lambda will compile as a private method of this class taking a
// PrivilegeWaiterCallback argument. As JUnit uses reflection to enumerate all methods
// including private methods, this would fail with a link error when running on S-.
// To solve this, make the lambda serializable, which causes the compiler to emit a
// synthetic class instead of a synthetic method.
tryTest @JvmSerializableLambda {
tryTest {
val slotIndex = SubscriptionManager.getSlotIndex(subId)!!
runAsShell(READ_PRIVILEGED_PHONE_STATE) @JvmSerializableLambda {
runAsShell(READ_PRIVILEGED_PHONE_STATE) {
tm.registerCarrierPrivilegesCallback(slotIndex, { it.run() }, cpb)
}
// Wait for the callback to be registered
@ -294,8 +282,8 @@ class CarrierConfigRule : TestRule {
}
assertTrue(cv.block(CARRIER_CONFIG_CHANGE_TIMEOUT_MS),
"Can't modify carrier service package")
} cleanup @JvmSerializableLambda {
runAsShell(READ_PRIVILEGED_PHONE_STATE) @JvmSerializableLambda {
} cleanup {
runAsShell(READ_PRIVILEGED_PHONE_STATE) {
tm.unregisterCarrierPrivilegesCallback(cpb)
}
}
@ -360,20 +348,14 @@ class CarrierConfigRule : TestRule {
val tm = context.getSystemService(TelephonyManager::class.java)!!
originalCarrierPrivileges.forEach { (subId, privileged) ->
val cpb = PrivilegeWaiterCallback()
// The lambda below is capturing |cpb|, whose type inherits from a class that appeared in
// T. This means the lambda will compile as a private method of this class taking a
// PrivilegeWaiterCallback argument. As JUnit uses reflection to enumerate all methods
// including private methods, this would fail with a link error when running on S-.
// To solve this, make the lambda serializable, which causes the compiler to emit a
// synthetic class instead of a synthetic method.
tryTest @JvmSerializableLambda {
tryTest {
val slotIndex = SubscriptionManager.getSlotIndex(subId)!!
runAsShell(READ_PRIVILEGED_PHONE_STATE) @JvmSerializableLambda {
runAsShell(READ_PRIVILEGED_PHONE_STATE) {
tm.registerCarrierPrivilegesCallback(slotIndex, { it.run() }, cpb)
}
cpb.eventuallyExpectCarrierPrivilegesChanged(privileged)
} cleanup @JvmSerializableLambda {
runAsShell(READ_PRIVILEGED_PHONE_STATE) @JvmSerializableLambda {
} cleanup {
runAsShell(READ_PRIVILEGED_PHONE_STATE) {
tm.unregisterCarrierPrivilegesCallback(cpb)
}
}