From c06d0bc0ca5f5933917582e6b61ddeab813b8cd5 Mon Sep 17 00:00:00 2001
From: Neil Fuller <nfuller@google.com>
Date: Fri, 10 Feb 2023 20:38:41 +0000
Subject: [PATCH] Fix robolectric / mockito test

Fix robolectric / mockito test.

Make TimeResult non-final for mocking. This test probably used to work
but something probably changed with mockito, breaking the test. Maybe
related to b/266973332 / b/265320139.

Efforts to switch to inline mockmaker to enable mocking of final classes
again failed, so this commit changes the class to be non-final again to
get it passing.

Bug: 266973332
Test: atest ./src/com/android/server/location/gnss/NtpNetworkTimeHelperTest.java
Change-Id: I150d9f33c9c5c012bf580a2b831f2a1de83c209a
---
 core/java/android/util/NtpTrustedTime.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/java/android/util/NtpTrustedTime.java b/core/java/android/util/NtpTrustedTime.java
index af432228183c8..98c0d7f4fbf17 100644
--- a/core/java/android/util/NtpTrustedTime.java
+++ b/core/java/android/util/NtpTrustedTime.java
@@ -129,7 +129,8 @@ public abstract class NtpTrustedTime implements TrustedTime {
      *
      * @hide
      */
-    public static final class TimeResult {
+    // Non-final for mocking frameworks
+    public static class TimeResult {
         private final long mUnixEpochTimeMillis;
         private final long mElapsedRealtimeMillis;
         private final int mUncertaintyMillis;