summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorChris Ye <lzye@google.com>2020-01-27 14:18:08 -0800
committerChris Ye <lzye@google.com>2020-01-29 13:00:41 -0800
commitcb7378d989e44aa69bb961ea9b8800ff2bdfa345 (patch)
treef861e4c1c2d3371ee62811c6788592546365320d /core/java/android
parenta004f24f68f38d6923e755f51b821616a0b307b0 (diff)
Change VibrationAttributes.Builder.replaceFlags() to @hide.
Remove VibrationAttributes.Builder.replaceFlags() from public API. Add VibrationAttributes.Builder.setFlags() as public API. Bug: 148286757 Test: atest VibrationAttributesTest Change-Id: I573268d75f70b36552bd1ecd547906a4b50b77cb
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/os/VibrationAttributes.java12
1 files changed, 12 insertions, 0 deletions
diff --git a/core/java/android/os/VibrationAttributes.java b/core/java/android/os/VibrationAttributes.java
index 3e16640895eb..27782fa74dab 100644
--- a/core/java/android/os/VibrationAttributes.java
+++ b/core/java/android/os/VibrationAttributes.java
@@ -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;
+ }
}
}