diff options
| author | Lais Andrade <lsandrade@google.com> | 2020-11-10 15:12:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-11-10 15:12:00 +0000 |
| commit | c2787b2289998974882953d62ec16d69ea83d090 (patch) | |
| tree | 14649068573d1c7160b820c01ea0a2954e86a2e4 /core/java/android | |
| parent | 3a6a6483209b08e53f8792f8f4fc745b93e9918a (diff) | |
| parent | 6b83aec26ffaf3a270a4e306772eae68d8d6b98b (diff) | |
Merge "Extract vibration settings and scaling code from VibratorService"
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/os/VibrationEffect.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/os/VibrationEffect.java b/core/java/android/os/VibrationEffect.java index f82cc22bd764..0f2a9f21a0bc 100644 --- a/core/java/android/os/VibrationEffect.java +++ b/core/java/android/os/VibrationEffect.java @@ -413,7 +413,7 @@ public abstract class VibrationEffect implements Parcelable { * * @hide */ - public abstract VibrationEffect resolve(int defaultAmplitude); + public abstract <T extends VibrationEffect> T resolve(int defaultAmplitude); /** * Scale the vibration effect intensity with the given constraints. @@ -425,7 +425,7 @@ public abstract class VibrationEffect implements Parcelable { * * @hide */ - public abstract VibrationEffect scale(float scaleFactor); + public abstract <T extends VibrationEffect> T scale(float scaleFactor); /** * Scale given vibration intensity by the given factor. |