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

Add logging to TestableNetworkCallback.

Browse Source 
This is not super useful because it cannot identify different
NetworkCallback objects from each other, but I've found it to be
better than nothing.

Test: manual
Change-Id: Ib402161f361c0f9fb68701bf171cbc99f598dafd
This commit is contained in:
Lorenzo Colitti
2020-11-18 01:36:17 +09:00
parent b1d2c89862
commit a726723ffb
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
staticlibs/devicetests/com/android/testutils/TestableNetworkCallback.kt
View File

@@ -21,6 +21,7 @@ import android.net.LinkProperties
import android.net.Network import android.net.Network
import android.net.NetworkCapabilities import android.net.NetworkCapabilities
import android.net.NetworkCapabilities.NET_CAPABILITY_VALIDATED import android.net.NetworkCapabilities.NET_CAPABILITY_VALIDATED
import android.util.Log
import com.android.net.module.util.ArrayTrackRecord import com.android.net.module.util.ArrayTrackRecord
import com.android.testutils.RecorderCallback.CallbackEntry.Available import com.android.testutils.RecorderCallback.CallbackEntry.Available
import com.android.testutils.RecorderCallback.CallbackEntry.BlockedStatus import com.android.testutils.RecorderCallback.CallbackEntry.BlockedStatus
@@ -48,6 +49,8 @@ open class RecorderCallback private constructor(
public constructor() : this(ArrayTrackRecord()) public constructor() : this(ArrayTrackRecord())
protected constructor(src: RecorderCallback?): this(src?.backingRecord ?: ArrayTrackRecord()) protected constructor(src: RecorderCallback?): this(src?.backingRecord ?: ArrayTrackRecord())
private val TAG = this::class.simpleName
sealed class CallbackEntry { sealed class CallbackEntry {
// To get equals(), hashcode(), componentN() etc for free, the child classes of // To get equals(), hashcode(), componentN() etc for free, the child classes of
// this class are data classes. But while data classes can inherit from other classes, // this class are data classes. But while data classes can inherit from other classes,
@@ -114,34 +117,42 @@ open class RecorderCallback private constructor(
// expect the callbacks not to record this, do not listen to PreCheck here. // expect the callbacks not to record this, do not listen to PreCheck here.
override fun onCapabilitiesChanged(network: Network, caps: NetworkCapabilities) { override fun onCapabilitiesChanged(network: Network, caps: NetworkCapabilities) {
Log.d(TAG, "onCapabilitiesChanged $network $caps")
history.add(CapabilitiesChanged(network, caps)) history.add(CapabilitiesChanged(network, caps))
} }
override fun onLinkPropertiesChanged(network: Network, lp: LinkProperties) { override fun onLinkPropertiesChanged(network: Network, lp: LinkProperties) {
Log.d(TAG, "onLinkPropertiesChanged $network $lp")
history.add(LinkPropertiesChanged(network, lp)) history.add(LinkPropertiesChanged(network, lp))
} }
override fun onBlockedStatusChanged(network: Network, blocked: Boolean) { override fun onBlockedStatusChanged(network: Network, blocked: Boolean) {
Log.d(TAG, "onBlockedStatusChanged $network $blocked")
history.add(BlockedStatus(network, blocked)) history.add(BlockedStatus(network, blocked))
} }
override fun onNetworkSuspended(network: Network) { override fun onNetworkSuspended(network: Network) {
Log.d(TAG, "onNetworkSuspended $network $network")
history.add(Suspended(network)) history.add(Suspended(network))
} }
override fun onNetworkResumed(network: Network) { override fun onNetworkResumed(network: Network) {
Log.d(TAG, "$network onNetworkResumed $network")
history.add(Resumed(network)) history.add(Resumed(network))
} }
override fun onLosing(network: Network, maxMsToLive: Int) { override fun onLosing(network: Network, maxMsToLive: Int) {
Log.d(TAG, "onLosing $network $maxMsToLive")
history.add(Losing(network, maxMsToLive)) history.add(Losing(network, maxMsToLive))
} }
override fun onLost(network: Network) { override fun onLost(network: Network) {
Log.d(TAG, "onLost $network")
history.add(Lost(network)) history.add(Lost(network))
} }
override fun onUnavailable() { override fun onUnavailable() {
Log.d(TAG, "onUnavailable")
history.add(Unavailable()) history.add(Unavailable())
} }
} }