Merge "Change VibrationAttributes.Builder.replaceFlags() to @hide." (24dc2c2d) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -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 −0

Original line number	Diff line number	Diff line
		@@ -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;
		}
		}
		}