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

Merge "Rename SignalThresholdInfo.Builder#setThresholdUnlimited" am: 31083c40b9 am: 54a0c76e6a

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1566912

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic9779453b960ce81c46555d2fd440d04eba3147c
This commit is contained in:
Rambo Wang
2021-02-09 03:42:15 +00:00
committed by Automerger Merge Worker
parent bd0e762d11 54a0c76e6a
commit 35fbb8cb85
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
telephony/java/android/telephony/SignalThresholdInfo.java
View File

@@ -402,29 +402,27 @@ public final class SignalThresholdInfo implements Parcelable {
* @see #getThresholds() for more details on signal strength thresholds * @see #getThresholds() for more details on signal strength thresholds
*/ */
public @NonNull Builder setThresholds(@NonNull int[] thresholds) { public @NonNull Builder setThresholds(@NonNull int[] thresholds) {
Objects.requireNonNull(thresholds, "thresholds must not be null"); return setThresholds(thresholds, false /*isSystem*/);
if (thresholds.length < MINIMUM_NUMBER_OF_THRESHOLDS_ALLOWED
|| thresholds.length > MAXIMUM_NUMBER_OF_THRESHOLDS_ALLOWED) {
throw new IllegalArgumentException(
"thresholds length must between " + MINIMUM_NUMBER_OF_THRESHOLDS_ALLOWED
+ " and " + MAXIMUM_NUMBER_OF_THRESHOLDS_ALLOWED);
}
mThresholds = thresholds.clone();
Arrays.sort(mThresholds);
return this;
} }
/** /**
* Set the signal strength thresholds for the corresponding signal measurement type without * Set the signal strength thresholds for the corresponding signal measurement type.
* the length limitation.
* *
* @param thresholds array of integer as the signal threshold values * @param thresholds array of integer as the signal threshold values
* @param isSystem true is the caller is system which does not have restrictions on
* the length of thresholds array.
* @return the builder to facilitate the chaining * @return the builder to facilitate the chaining
* *
* @hide * @hide
*/ */
public @NonNull Builder setThresholdsUnlimited(@NonNull int[] thresholds) { public @NonNull Builder setThresholds(@NonNull int[] thresholds, boolean isSystem) {
Objects.requireNonNull(thresholds, "thresholds must not be null"); Objects.requireNonNull(thresholds, "thresholds must not be null");
if (!isSystem && (thresholds.length < MINIMUM_NUMBER_OF_THRESHOLDS_ALLOWED
|| thresholds.length > MAXIMUM_NUMBER_OF_THRESHOLDS_ALLOWED)) {
throw new IllegalArgumentException(
"thresholds length must between " + MINIMUM_NUMBER_OF_THRESHOLDS_ALLOWED
+ " and " + MAXIMUM_NUMBER_OF_THRESHOLDS_ALLOWED);
}
mThresholds = thresholds.clone(); mThresholds = thresholds.clone();
Arrays.sort(mThresholds); Arrays.sort(mThresholds);
return this; return this;