Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add local logs to NetworkTimeUpdateService

Browse Source 
Bug: b/217357882
Test: Changes adds local logs. Existing unit tests still pass.
Change-Id: I2876a479c5219b6e4af6dfe25ba0942d82115ca5
This commit is contained in:
Kanyinsola
2022-02-23 17:04:30 +00:00
parent 94dd832f60
commit faedb36fb7
2 changed files with 43 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/util/NtpTrustedTime.java
View File

@@ -81,7 +81,16 @@ public class NtpTrustedTime implements TrustedTime {
/** Calculates and returns the age of this result. */
public long getAgeMillis() {
return SystemClock.elapsedRealtime() - mElapsedRealtimeMillis;
return getAgeMillis(SystemClock.elapsedRealtime());
}
/**
* Calculates and returns the age of this result relative to currentElapsedRealtimeMillis.
*
* @param currentElapsedRealtimeMillis - reference elapsed real time
*/
public long getAgeMillis(long currentElapsedRealtimeMillis) {
return currentElapsedRealtimeMillis - mElapsedRealtimeMillis;
}
@Override

36
services/core/java/com/android/server/NetworkTimeUpdateService.java
View File

@@ -16,6 +16,7 @@
package com.android.server;
import android.annotation.NonNull;
import android.app.AlarmManager;
import android.app.PendingIntent;
import android.app.timedetector.NetworkTimeSuggestion;
@@ -38,6 +39,7 @@ import android.os.PowerManager;
import android.os.SystemClock;
import android.os.TimestampedValue;
import android.provider.Settings;
import android.util.LocalLog;
import android.util.Log;
import android.util.NtpTrustedTime;
import android.util.TimeUtils;
@@ -95,6 +97,13 @@ public class NetworkTimeUpdateService extends Binder {
// connection to happen.
private int mTryAgainCounter;
/**
* A log that records the decisions to fetch a network time update.
* This is logged in bug reports to assist with debugging issues with network time suggestions.
*/
@NonNull
private final LocalLog mLocalLog = new LocalLog(30, false /* useLocalTimestamps */);
public NetworkTimeUpdateService(Context context) {
mContext = context;
mTime = NtpTrustedTime.getInstance(context);
@@ -155,15 +164,29 @@ public class NetworkTimeUpdateService extends Binder {
}
private void onPollNetworkTimeUnderWakeLock(int event) {
long currentElapsedRealtimeMillis = SystemClock.elapsedRealtime();
// Force an NTP fix when outdated
NtpTrustedTime.TimeResult cachedNtpResult = mTime.getCachedTimeResult();
if (cachedNtpResult == null || cachedNtpResult.getAgeMillis() >= mPollingIntervalMs) {
if (cachedNtpResult == null || cachedNtpResult.getAgeMillis(currentElapsedRealtimeMillis)
>= mPollingIntervalMs) {
if (DBG) Log.d(TAG, "Stale NTP fix; forcing refresh");
mTime.forceRefresh();
boolean isSuccessful = mTime.forceRefresh();
if (!isSuccessful) {
String logMsg = "forceRefresh() returned false: cachedNtpResult=" + cachedNtpResult
+ ", currentElapsedRealtimeMillis=" + currentElapsedRealtimeMillis;
if (DBG) {
Log.d(TAG, logMsg);
}
mLocalLog.log(logMsg);
}
cachedNtpResult = mTime.getCachedTimeResult();
}
if (cachedNtpResult != null && cachedNtpResult.getAgeMillis() < mPollingIntervalMs) {
if (cachedNtpResult != null
&& cachedNtpResult.getAgeMillis(currentElapsedRealtimeMillis)
< mPollingIntervalMs) {
// Obtained fresh fix; schedule next normal update
resetAlarm(mPollingIntervalMs);
@@ -180,6 +203,11 @@ public class NetworkTimeUpdateService extends Binder {
resetAlarm(mPollingIntervalShorterMs);
} else {
// Try much later
String logMsg = "mTryAgainTimesMax exceeded, cachedNtpResult=" + cachedNtpResult;
if (DBG) {
Log.d(TAG, logMsg);
}
mLocalLog.log(logMsg);
mTryAgainCounter = 0;
resetAlarm(mPollingIntervalMs);
}
@@ -285,6 +313,8 @@ public class NetworkTimeUpdateService extends Binder {
if (ntpResult != null) {
pw.println("NTP result age: " + ntpResult.getAgeMillis());
}
pw.println("Local logs:");
mLocalLog.dump(fd, pw, args);
pw.println();
}
}