commit cfdc975ffc4542f9ed2b4d1723f9aab159a2f262
author Arthur Hung <arthurhung@google.com> Mon Mar 04 19:25:36 2019 +0800
committer Arthur Hung <arthurhung@google.com> Tue Mar 05 09:36:59 2019 +0800
tree 6e644ce99b5341a6f782b86dc5d4fef444cdb97c
parent f278d267f5f29db63e5f488f32984fe73949d4b4

Add @NonNull to createPredefined

Bug: 126699931
Test: Manual
Change-Id: Id90841415ebf9fbd681767cc36c65154d9980286

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index f170b4a..2a670b7 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -35525,7 +35525,7 @@
 
   public abstract class VibrationEffect implements android.os.Parcelable {
     method public static android.os.VibrationEffect createOneShot(long, int);
-    method public static android.os.VibrationEffect createPredefined(int);
+    method @NonNull 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();

core/java/android/os/VibrationEffect.java

diff --git a/core/java/android/os/VibrationEffect.java b/core/java/android/os/VibrationEffect.java
index 44add87..c74cbff 100644
--- a/core/java/android/os/VibrationEffect.java
+++ b/core/java/android/os/VibrationEffect.java
@@ -17,6 +17,7 @@
 package android.os;
 
 import android.annotation.IntDef;
+import android.annotation.NonNull;
 import android.annotation.Nullable;
 import android.annotation.TestApi;
 import android.content.ContentResolver;
@@ -240,6 +241,7 @@
      *
      * @return The desired effect.
      */
+    @NonNull
     public static VibrationEffect createPredefined(@EffectType int effectId) {
         return get(effectId, true);
     }