From 422354c931aa47308cc1aa5033a6e96e55b76cfb Mon Sep 17 00:00:00 2001
From: Neil Fuller <nfuller@google.com>
Date: Mon, 18 Jul 2022 13:39:01 +0100
Subject: [PATCH] Non-functional tidy-ups

Changes to source for non-functional reasons, i.e. unnecessary code, doc
improvements.

Bug: None - just docs/java cleanups
Test: build only
Change-Id: Id6c71f4e6dbee750cf22138dca28e861b5aaad47
---
 .../java/android/app/time/TimeCapabilities.java | 17 ++++++++---------
 .../android/app/timedetector/TimeDetector.java  |  7 ++++++-
 .../app/timezonedetector/TimeZoneDetector.java  |  7 ++++++-
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/core/java/android/app/time/TimeCapabilities.java b/core/java/android/app/time/TimeCapabilities.java
index 9b9dce2bcbe4e..44bc1788fa6ad 100644
--- a/core/java/android/app/time/TimeCapabilities.java
+++ b/core/java/android/app/time/TimeCapabilities.java
@@ -39,16 +39,15 @@ import java.util.Objects;
  */
 public final class TimeCapabilities implements Parcelable {
 
-    public static final @NonNull Creator<TimeCapabilities> CREATOR =
-            new Creator<TimeCapabilities>() {
-                public TimeCapabilities createFromParcel(Parcel in) {
-                    return TimeCapabilities.createFromParcel(in);
-                }
+    public static final @NonNull Creator<TimeCapabilities> CREATOR = new Creator<>() {
+        public TimeCapabilities createFromParcel(Parcel in) {
+            return TimeCapabilities.createFromParcel(in);
+        }
 
-                public TimeCapabilities[] newArray(int size) {
-                    return new TimeCapabilities[size];
-                }
-            };
+        public TimeCapabilities[] newArray(int size) {
+            return new TimeCapabilities[size];
+        }
+    };
 
 
     /**
diff --git a/core/java/android/app/timedetector/TimeDetector.java b/core/java/android/app/timedetector/TimeDetector.java
index 9529d4c632a1d..db1614b32b597 100644
--- a/core/java/android/app/timedetector/TimeDetector.java
+++ b/core/java/android/app/timedetector/TimeDetector.java
@@ -24,7 +24,12 @@ import android.os.SystemClock;
 import android.os.TimestampedValue;
 
 /**
- * The interface through which system components can send signals to the TimeDetectorService.
+ * The interface through which system components can query and send signals to the
+ * TimeDetectorService.
+ *
+ * <p>SDK APIs are exposed on {@link android.app.time.TimeManager} to obscure the internal split
+ * between time and time zone detection services. Migrate APIs there if they need to be part of an
+ * SDK API.
  *
  * @hide
  */
diff --git a/core/java/android/app/timezonedetector/TimeZoneDetector.java b/core/java/android/app/timezonedetector/TimeZoneDetector.java
index aac23d88fa7bc..bae1c1c7312d1 100644
--- a/core/java/android/app/timezonedetector/TimeZoneDetector.java
+++ b/core/java/android/app/timezonedetector/TimeZoneDetector.java
@@ -22,7 +22,12 @@ import android.annotation.SystemService;
 import android.content.Context;
 
 /**
- * The interface through which system components can send signals to the TimeZoneDetectorService.
+ * The interface through which system components can query and send signals to the
+ * TimeZoneDetectorService.
+ *
+ * <p>SDK APIs are exposed on {@link android.app.time.TimeManager} to obscure the internal split
+ * between time and time zone detection services. Migrate APIs there if they need to be part of an
+ * SDK API.
  *
  * @hide
  */