commit 505872d841dbe0ab2cc24f1162146904f30d118c
author Alexey Kuzmin <alexeykuzmin@google.com> Mon Mar 19 19:27:46 2018 +0000
committer Alexey Kuzmin <alexeykuzmin@google.com> Tue Apr 03 15:58:26 2018 +0100
tree 74c0a9bc596c0f8e864fba6202b224d4a47d5c1a
parent aad9a3a9f1d8da50b23e67453802d49d61835347

Mark methods as @TestApi

Methods previously marked as @hide which are used from cts were marked
as @TestApi
Bug: 74227356
Test: Look through the code of VibrationEffect.

Change-Id: I83cd9b9f19c43467bb310598c6b390583908a162

core/java/android/os/VibrationEffect.java

diff --git a/core/java/android/os/VibrationEffect.java b/core/java/android/os/VibrationEffect.java
index 583319a..3a2e485 100644
--- a/core/java/android/os/VibrationEffect.java
+++ b/core/java/android/os/VibrationEffect.java
@@ -17,14 +17,13 @@
 package android.os;
 
 import android.annotation.Nullable;
+import android.annotation.TestApi;
 import android.content.Context;
 import android.hardware.vibrator.V1_0.EffectStrength;
 import android.hardware.vibrator.V1_2.Effect;
 import android.net.Uri;
 import android.util.MathUtils;
 
-import com.android.internal.annotations.VisibleForTesting;
-
 import java.util.Arrays;
 
 /**
@@ -100,7 +99,7 @@
      * @see #get(Uri, Context)
      * @hide
      */
-    @VisibleForTesting
+    @TestApi
     public static final int[] RINGTONES = {
         Effect.RINGTONE_1,
         Effect.RINGTONE_2,
@@ -219,6 +218,7 @@
      * @return The desired effect.
      * @hide
      */
+    @TestApi
     public static VibrationEffect get(int effectId) {
         return get(effectId, true);
     }
@@ -245,6 +245,7 @@
      * @return The desired effect.
      * @hide
      */
+    @TestApi
     public static VibrationEffect get(int effectId, boolean fallback) {
         VibrationEffect effect = new Prebaked(effectId, fallback);
         effect.validate();
@@ -267,6 +268,7 @@
      *
      * @hide
      */
+    @TestApi
     @Nullable
     public static VibrationEffect get(Uri uri, Context context) {
         String[] uris = context.getResources().getStringArray(
@@ -307,12 +309,14 @@
      * This assumes that the previous value was in the range [0, MAX_AMPLITUDE]
      * @hide
      */
+    @TestApi
     protected static int scale(int amplitude, float gamma, int maxAmplitude) {
         float val = MathUtils.pow(amplitude / (float) MAX_AMPLITUDE, gamma);
         return (int) (val * maxAmplitude);
     }
 
     /** @hide */
+    @TestApi
     public static class OneShot extends VibrationEffect implements Parcelable {
         private final long mDuration;
         private final int mAmplitude;
@@ -413,6 +417,7 @@
     }
 
     /** @hide */
+    @TestApi
     public static class Waveform extends VibrationEffect implements Parcelable {
         private final long[] mTimings;
         private final int[] mAmplitudes;
@@ -576,6 +581,7 @@
     }
 
     /** @hide */
+    @TestApi
     public static class Prebaked extends VibrationEffect implements Parcelable {
         private final int mEffectId;
         private final boolean mFallback;