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

Commit 6cbc4013 authored by Mustafa Emre Acer's avatar Mustafa Emre Acer Committed by Automerger Merge Worker
Browse files

Merge "Expose TimeManager.suggestExternalTime()" into sc-dev am: 7c4f635b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13981165

Change-Id: I97665672ed668ee770874573ada04069f559ac7f
parents ce7a287a 7c4f635b

core/api/system-current.txt

+10 −0
Original line number Diff line number Diff line
@@ -1733,10 +1733,20 @@ package android.app.time { 
    field public static final int CAPABILITY_POSSESSED = 40; // 0x28

  }













  public final class ExternalTimeSuggestion implements android.os.Parcelable {













    ctor public ExternalTimeSuggestion(long, long);













    method public void addDebugInfo(@NonNull java.lang.String...);













    method public int describeContents();













    method @NonNull public java.util.List<java.lang.String> getDebugInfo();













    method public void writeToParcel(@NonNull android.os.Parcel, int);













    field @NonNull public static final android.os.Parcelable.Creator<android.app.time.ExternalTimeSuggestion> CREATOR;













  }



























  public final class TimeManager {















    method @RequiresPermission(android.Manifest.permission.MANAGE_TIME_AND_ZONE_DETECTION) public void addTimeZoneDetectorListener(@NonNull java.util.concurrent.Executor, @NonNull android.app.time.TimeManager.TimeZoneDetectorListener);















    method @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_TIME_AND_ZONE_DETECTION) public android.app.time.TimeZoneCapabilitiesAndConfig getTimeZoneCapabilitiesAndConfig();















    method @RequiresPermission(android.Manifest.permission.MANAGE_TIME_AND_ZONE_DETECTION) public void removeTimeZoneDetectorListener(@NonNull android.app.time.TimeManager.TimeZoneDetectorListener);













    method @RequiresPermission(android.Manifest.permission.SUGGEST_EXTERNAL_TIME) public void suggestExternalTime(@NonNull android.app.time.ExternalTimeSuggestion);















    method @RequiresPermission(android.Manifest.permission.MANAGE_TIME_AND_ZONE_DETECTION) public boolean updateTimeZoneConfiguration(@NonNull android.app.time.TimeZoneConfiguration);















  }















































core/java/android/app/time/ExternalTimeSuggestion.java



+2
−1




























Original line number
Diff line number
Diff line








@@ -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() {

































core/java/android/app/time/TimeManager.java



+0
−1




























Original line number
Diff line number
Diff line








@@ -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) {