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

Commit 6b055975 authored by Neil Fuller's avatar Neil Fuller
Browse files

Handle unexpected case when TimeResult is null 

Handle unexpected case when TimeResult is null during tests. This should
not be possible but theoretically NtpTrustedTime.getCachedTimeResult()
can return null so this is being done to keep any linter / null checker
happy.

Test: treehugger only
Bug: 271975153
Change-Id: I030fa268a83d1015213e6fc2cb6a8d804e74f7c0
parent 496ebf67

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

+8 −2
Original line number Diff line number Diff line
@@ -424,9 +424,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;

        }