Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Avoid a @Nullable Boolean" am: 81a42af40d am: fd9c242128

Browse Source 
Change-Id: Id445c7151b8828df42e362eb2391357a18d06dee
This commit is contained in:
Automerger Merge Worker
2020-02-06 09:05:41 +00:00
parent 42ccd07772 fd9c242128
commit 0db1f949da
2 changed files with 35 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
core/java/android/timezone/CountryTimeZones.java
View File

@@ -18,7 +18,6 @@ package android.timezone;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.SuppressLint;
import android.icu.util.TimeZone;
import java.util.ArrayList;
@@ -206,27 +205,47 @@ public final class CountryTimeZones {
}
/**
* Returns a time zone for the country, if there is one, that matches the desired properties. If
* there are multiple matches and the {@code bias} is one of them then it is returned, otherwise
* an arbitrary match is returned based on the {@link #getEffectiveTimeZoneMappingsAt(long)}
* ordering.
* Returns a time zone for the country, if there is one, that matches the supplied properties.
* If there are multiple matches and the {@code bias} is one of them then it is returned,
* otherwise an arbitrary match is returned based on the {@link
* #getEffectiveTimeZoneMappingsAt(long)} ordering.
*
* @param whenMillis the UTC time to match against
* @param bias the time zone to prefer, can be {@code null} to indicate there is no preference
* @param totalOffsetMillis the offset from UTC at {@code whenMillis}
* @param isDst the Daylight Savings Time state at {@code whenMillis}. {@code true} means DST,
* {@code false} means not DST, {@code null} means unknown
* @param dstOffsetMillis the part of {@code totalOffsetMillis} contributed by DST, only used if
* {@code isDst} is {@code true}. The value can be {@code null} if the DST offset is
* unknown
* @param whenMillis the UTC time to match against
* @param bias the time zone to prefer, can be {@code null}
* {@code false} means not DST
* @return an {@link OffsetResult} with information about a matching zone, or {@code null} if
* there is no match
*/
@Nullable
public OffsetResult lookupByOffsetWithBias(int totalOffsetMillis, @Nullable Boolean isDst,
@SuppressLint("AutoBoxing") @Nullable Integer dstOffsetMillis, long whenMillis,
@Nullable TimeZone bias) {
public OffsetResult lookupByOffsetWithBias(long whenMillis, @Nullable TimeZone bias,
int totalOffsetMillis, boolean isDst) {
libcore.timezone.CountryTimeZones.OffsetResult delegateOffsetResult =
mDelegate.lookupByOffsetWithBias(
totalOffsetMillis, isDst, dstOffsetMillis, whenMillis, bias);
whenMillis, bias, totalOffsetMillis, isDst);
return delegateOffsetResult == null ? null :
new OffsetResult(
delegateOffsetResult.getTimeZone(), delegateOffsetResult.isOnlyMatch());
}
/**
* Returns a time zone for the country, if there is one, that matches the supplied properties.
* If there are multiple matches and the {@code bias} is one of them then it is returned,
* otherwise an arbitrary match is returned based on the {@link
* #getEffectiveTimeZoneMappingsAt(long)} ordering.
*
* @param whenMillis the UTC time to match against
* @param bias the time zone to prefer, can be {@code null} to indicate there is no preference
* @param totalOffsetMillis the offset from UTC at {@code whenMillis}
* @return an {@link OffsetResult} with information about a matching zone, or {@code null} if
* there is no match
*/
@Nullable
public OffsetResult lookupByOffsetWithBias(long whenMillis, @Nullable TimeZone bias,
int totalOffsetMillis) {
libcore.timezone.CountryTimeZones.OffsetResult delegateOffsetResult =
mDelegate.lookupByOffsetWithBias(whenMillis, bias, totalOffsetMillis);
return delegateOffsetResult == null ? null :
new OffsetResult(
delegateOffsetResult.getTimeZone(), delegateOffsetResult.isOnlyMatch());

2
core/java/android/util/TimeUtils.java
View File

@@ -79,7 +79,7 @@ public class TimeUtils {
return null;
}
CountryTimeZones.OffsetResult offsetResult = countryTimeZones.lookupByOffsetWithBias(
offsetMillis, isDst, null /* dstOffsetMillis */, whenMillis, bias);
whenMillis, bias, offsetMillis, isDst);
return offsetResult != null ? offsetResult.getTimeZone() : null;
}