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

Merge "Change VibrationAttributes.Builder.replaceFlags() to @hide."

Browse Source
This commit is contained in:
Chris Ye
2020-01-31 17:19:08 +00:00
committed by Android (Google) Code Review
parent 6fc5328c79 cb7378d989
commit 24dc2c2d53
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -36944,7 +36944,7 @@ package android.os {
ctor public VibrationAttributes.Builder();
ctor public VibrationAttributes.Builder(@Nullable android.os.VibrationAttributes);
method @NonNull public android.os.VibrationAttributes build();
method @NonNull public android.os.VibrationAttributes.Builder replaceFlags(int);
method @NonNull public android.os.VibrationAttributes.Builder setFlags(int, int);
method @NonNull public android.os.VibrationAttributes.Builder setUsage(int);
}

12
core/java/android/os/VibrationAttributes.java
View File

@@ -391,11 +391,23 @@ public final class VibrationAttributes implements Parcelable {
* Replaces flags
* @param flags any combination of flags.
* @return the same Builder instance.
* @hide
*/
public @NonNull Builder replaceFlags(int flags) {
mFlags = flags;
return this;
}
/**
* Set flags
* @param flags combination of flags to be set.
* @param mask Bit range that should be changed.
* @return the same Builder instance.
*/
public @NonNull Builder setFlags(int flags, int mask) {
mFlags = (mFlags & ~mask) | (flags & mask);
return this;
}
}
}