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

[WIFICOND][API] Clarify time usage

Browse Source 
- Use long for time
- Add annotations

Per API council feedback.

Bug: 148680192
Test: atest android.net.wifi
Test: atest com.android.server.wifi
Change-Id: Ib32640a864b8f4d7674348c1eb8bbd6d4f17ab32
This commit is contained in:
Etan Cohen
2020-02-04 13:39:17 -08:00
parent 111f0aea25
commit d098b4f7b2
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/system-current.txt
View File

@@ -8235,12 +8235,12 @@ package android.net.wifi.wificond {
public final class PnoSettings implements android.os.Parcelable {
ctor public PnoSettings();
method public int describeContents();
method public int getIntervalMillis();
method public long getIntervalMillis();
method public int getMin2gRssiDbm();
method public int getMin5gRssiDbm();
method public int getMin6gRssiDbm();
method @NonNull public java.util.List<android.net.wifi.wificond.PnoNetwork> getPnoNetworks();
method public void setIntervalMillis(int);
method public void setIntervalMillis(long);
method public void setMin2gRssiDbm(int);
method public void setMin5gRssiDbm(int);
method public void setMin6gRssiDbm(int);

15
wifi/java/android/net/wifi/wificond/PnoSettings.java
View File

@@ -16,6 +16,7 @@
package android.net.wifi.wificond;
import android.annotation.DurationMillisLong;
import android.annotation.NonNull;
import android.annotation.SystemApi;
import android.os.Parcel;
@@ -33,7 +34,7 @@ import java.util.Objects;
*/
@SystemApi
public final class PnoSettings implements Parcelable {
private int mIntervalMs;
private long mIntervalMs;
private int mMin2gRssi;
private int mMin5gRssi;
private int mMin6gRssi;
@@ -47,17 +48,17 @@ public final class PnoSettings implements Parcelable {
*
* @return An interval in milliseconds.
*/
public int getIntervalMillis() {
public @DurationMillisLong long getIntervalMillis() {
return mIntervalMs;
}
/**
* Set the requested PNO scan interval in milliseconds.
*
* @param intervalMs An interval in milliseconds.
* @param intervalMillis An interval in milliseconds.
*/
public void setIntervalMillis(int intervalMs) {
this.mIntervalMs = intervalMs;
public void setIntervalMillis(@DurationMillisLong long intervalMillis) {
this.mIntervalMs = intervalMillis;
}
/**
@@ -176,7 +177,7 @@ public final class PnoSettings implements Parcelable {
**/
@Override
public void writeToParcel(@NonNull Parcel out, int flags) {
out.writeInt(mIntervalMs);
out.writeLong(mIntervalMs);
out.writeInt(mMin2gRssi);
out.writeInt(mMin5gRssi);
out.writeInt(mMin6gRssi);
@@ -189,7 +190,7 @@ public final class PnoSettings implements Parcelable {
@Override
public PnoSettings createFromParcel(Parcel in) {
PnoSettings result = new PnoSettings();
result.mIntervalMs = in.readInt();
result.mIntervalMs = in.readLong();
result.mMin2gRssi = in.readInt();
result.mMin5gRssi = in.readInt();
result.mMin6gRssi = in.readInt();