diff options
| author | 2019-02-28 14:50:09 +0000 | |
|---|---|---|
| committer | 2019-02-28 14:50:09 +0000 | |
| commit | 7452b628e1322ecb43fce4e22de84fe9a36082b7 (patch) | |
| tree | f6d870ed61f00b36ebcd7301c289538231b38667 | |
| parent | b6965dfcc40108181ea3b825367e4082e2ed6084 (diff) | |
| parent | 00657b89468b2a1aa66b7192e0f5d096d399f040 (diff) | |
Merge "Rename createPrebaked to createPredefined"
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/os/VibrationEffect.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index 46ab85444750..b274bff20f5a 100644 --- a/api/current.txt +++ b/api/current.txt @@ -35517,7 +35517,7 @@ package android.os { public abstract class VibrationEffect implements android.os.Parcelable { method public static android.os.VibrationEffect createOneShot(long, int); - method public static android.os.VibrationEffect createPrebaked(int); + method public static android.os.VibrationEffect createPredefined(int); method public static android.os.VibrationEffect createWaveform(long[], int); method public static android.os.VibrationEffect createWaveform(long[], int[], int); method public int describeContents(); diff --git a/core/java/android/os/VibrationEffect.java b/core/java/android/os/VibrationEffect.java index 99fb608b80dc..471ae30a4058 100644 --- a/core/java/android/os/VibrationEffect.java +++ b/core/java/android/os/VibrationEffect.java @@ -240,7 +240,7 @@ public abstract class VibrationEffect implements Parcelable { * * @return The desired effect. */ - public static VibrationEffect createPrebaked(@EffectType int effectId) { + public static VibrationEffect createPredefined(@EffectType int effectId) { return get(effectId, true); } |