Merge "Fix robolectric / mockito test"

2023-02-13 11:41:17 +00:00
parent 44920b1c48 c06d0bc0ca
commit 8e3602bf7a
1 changed files with 2 additions and 1 deletions
--- 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;