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

Fix SatisfiedTime initialization

Browse source 
mSatisfiedTime now initializes with the current time upon NRI
creation, or copied when the copy constructor is called.

Test: atest ConnectivityCoverageTests --test-filter 'NetworkRequestInfo*' --update-device
Flag: EXEMPT controlled by kill switch
Bug: 419123367
Change-Id: If707b96bf6ce5c6cb0287d5c2d6056591dd6769f
This commit is contained in:
Junyu Lai 2025-06-03 18:18:55 +08:00
commit 1ff0c98745
1 changed files with 122 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
service/src/com/android/server/ConnectivityService.java
View file

@ -1549,6 +1549,11 @@ public class ConnectivityService extends IConnectivityManager.Stub
return SdkLevel.isAtLeastB();
}
/** Get SystemClock.elapsedRealtime() */
public long getElapsedRealtime() {
return SystemClock.elapsedRealtime();
}
/**
* Get system properties to use in ConnectivityService.
*/
@ -8121,7 +8126,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
@Nullable final NetworkRequest activeRequest) {
mSatisfier = satisfier;
mActiveRequest = activeRequest;
mSatisfiedTime = SystemClock.elapsedRealtime();
mSatisfiedTime = mDeps.getElapsedRealtime();
}
// The network currently satisfying this NRI. Only one request in an NRI can have a
@ -8132,10 +8137,10 @@ public class ConnectivityService extends IConnectivityManager.Stub
return mSatisfier;
}
private long mSatisfiedTime = 0;
private long mSatisfiedTime = mDeps.getElapsedRealtime();
/**
* Get timestamp (SystemClock.elapsedRealtime()) when the satisfier is set for this NRI.
* Get timestamp (SystemClock.elapsedRealtime()) when is set or removed.
* Resets when the satisfier changes.
*/
public long getSatisfiedTime() {
@ -8318,6 +8323,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
}
setSatisfier(satisfier, activeRequest);
}
mSatisfiedTime = nri.mSatisfiedTime;
mMatchedNetIdWhenFrozen = nri.mMatchedNetIdWhenFrozen;
mQueuedCallbacks = nri.mQueuedCallbacks;
mMessenger = nri.mMessenger;