diff options
| author | Mustafa Emre Acer <meacer@google.com> | 2021-03-29 18:46:59 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-03-29 18:46:59 +0000 |
| commit | 7c4f635b3bb7e2d23abb1b55fc7b6313abaa3f82 (patch) | |
| tree | bb5614a9acd5721a7dc94c43e6f5f1b209648390 /core/java | |
| parent | 0906f735dcdc61a2e3e8f839b3cfe5de3c29508f (diff) | |
| parent | 5265da19f90c480f0fe2b2ee1ee15a7a6e03bb0c (diff) | |
Merge "Expose TimeManager.suggestExternalTime()" into sc-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/time/ExternalTimeSuggestion.java | 3 | ||||
| -rw-r--r-- | core/java/android/app/time/TimeManager.java | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/app/time/ExternalTimeSuggestion.java b/core/java/android/app/time/ExternalTimeSuggestion.java index 61defb588170..8e281c07c45d 100644 --- a/core/java/android/app/time/ExternalTimeSuggestion.java +++ b/core/java/android/app/time/ExternalTimeSuggestion.java @@ -20,6 +20,7 @@ import android.annotation.CurrentTimeMillisLong; import android.annotation.ElapsedRealtimeLong; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.SystemApi; import android.os.Parcel; import android.os.Parcelable; import android.os.TimestampedValue; @@ -67,6 +68,7 @@ import java.util.Objects; * * @hide */ +@SystemApi public final class ExternalTimeSuggestion implements Parcelable { public static final @NonNull Creator<ExternalTimeSuggestion> CREATOR = @@ -129,7 +131,6 @@ public final class ExternalTimeSuggestion implements Parcelable { /** * Returns information that can be useful for debugging / logging. See {@link #addDebugInfo}. - * {@hide} */ @NonNull public List<String> getDebugInfo() { diff --git a/core/java/android/app/time/TimeManager.java b/core/java/android/app/time/TimeManager.java index c71badb0d484..d6acb8cd1076 100644 --- a/core/java/android/app/time/TimeManager.java +++ b/core/java/android/app/time/TimeManager.java @@ -262,7 +262,6 @@ public final class TimeManager { * HAL. This time <em>may</em> be used to set the device system clock, depending on the device * configuration and user settings. This method call is processed asynchronously. * See {@link ExternalTimeSuggestion} for more details. - * {@hide} */ @RequiresPermission(android.Manifest.permission.SUGGEST_EXTERNAL_TIME) public void suggestExternalTime(@NonNull ExternalTimeSuggestion timeSuggestion) { |