Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b489d914 authored by Neil Fuller's avatar Neil Fuller Committed by Android (Google) Code Review
Browse files

Merge "Handle unexpected case when TimeResult is null"

parents 9a5a665a 6b055975

services/core/java/com/android/server/timedetector/NetworkTimeUpdateService.java

+8 −2
Original line number Diff line number Diff line
@@ -415,9 +415,15 @@ public class NetworkTimeUpdateService extends Binder { 
            logToDebugAndDumpsys("forceRefreshForTests: refreshSuccessful=" + refreshSuccessful);



            if (refreshSuccessful) {

                makeNetworkTimeSuggestion(mNtpTrustedTime.getCachedTimeResult(),

                TimeResult cachedTimeResult = mNtpTrustedTime.getCachedTimeResult();

                if (cachedTimeResult == null) {

                    logToDebugAndDumpsys(

                            "forceRefreshForTests: cachedTimeResult unexpectedly null");

                } else {

                    makeNetworkTimeSuggestion(cachedTimeResult,

                            "EngineImpl.forceRefreshForTests()", refreshCallbacks);

                }

            }

            return refreshSuccessful;

        }