Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 505872d8 authored by Alexey Kuzmin's avatar Alexey Kuzmin
Browse files

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
parent aad9a3a9

api/test-current.txt

+45 −0
Original line number Diff line number Diff line
@@ -564,6 +564,51 @@ package android.os { 
    field public static final java.lang.String ACTION_USER_RESTRICTIONS_CHANGED = "android.os.action.USER_RESTRICTIONS_CHANGED";

  }



  public abstract class VibrationEffect implements android.os.Parcelable {

    method public static android.os.VibrationEffect get(int);

    method public static android.os.VibrationEffect get(int, boolean);

    method public static android.os.VibrationEffect get(android.net.Uri, android.content.Context);

    method protected static int scale(int, float, int);

    field public static final int[] RINGTONES;

  }



  public static class VibrationEffect.OneShot extends android.os.VibrationEffect implements android.os.Parcelable {

    ctor public VibrationEffect.OneShot(android.os.Parcel);

    ctor public VibrationEffect.OneShot(long, int);

    method public int getAmplitude();

    method public long getDuration();

    method public android.os.VibrationEffect.OneShot scale(float, int);

    method public void validate();

    method public void writeToParcel(android.os.Parcel, int);

    field public static final android.os.Parcelable.Creator<android.os.VibrationEffect.OneShot> CREATOR;

  }



  public static class VibrationEffect.Prebaked extends android.os.VibrationEffect implements android.os.Parcelable {

    ctor public VibrationEffect.Prebaked(android.os.Parcel);

    ctor public VibrationEffect.Prebaked(int, boolean);

    method public long getDuration();

    method public int getEffectStrength();

    method public int getId();

    method public void setEffectStrength(int);

    method public boolean shouldFallback();

    method public void validate();

    method public void writeToParcel(android.os.Parcel, int);

    field public static final android.os.Parcelable.Creator<android.os.VibrationEffect.Prebaked> CREATOR;

  }



  public static class VibrationEffect.Waveform extends android.os.VibrationEffect implements android.os.Parcelable {

    ctor public VibrationEffect.Waveform(android.os.Parcel);

    ctor public VibrationEffect.Waveform(long[], int[], int);

    method public int[] getAmplitudes();

    method public long getDuration();

    method public int getRepeatIndex();

    method public long[] getTimings();

    method public android.os.VibrationEffect.Waveform scale(float, int);

    method public void validate();

    method public void writeToParcel(android.os.Parcel, int);

    field public static final android.os.Parcelable.Creator<android.os.VibrationEffect.Waveform> CREATOR;

  }



}



package android.print {

core/java/android/os/VibrationEffect.java

+9 −3
Original line number Diff line number Diff line
@@ -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 @@ public abstract class VibrationEffect implements Parcelable { 
     * @see #get(Uri, Context)

     * @hide

     */

    @VisibleForTesting

    @TestApi

    public static final int[] RINGTONES = {

        Effect.RINGTONE_1,

        Effect.RINGTONE_2,
@@ -219,6 +218,7 @@ public abstract class VibrationEffect implements Parcelable { 
     * @return The desired effect.

     * @hide

     */

    @TestApi

    public static VibrationEffect get(int effectId) {

        return get(effectId, true);

    }
@@ -245,6 +245,7 @@ public abstract class VibrationEffect implements Parcelable { 
     * @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 @@ public abstract class VibrationEffect implements Parcelable { 
     *

     * @hide

     */

    @TestApi

    @Nullable

    public static VibrationEffect get(Uri uri, Context context) {

        String[] uris = context.getResources().getStringArray(
@@ -307,12 +309,14 @@ public abstract class VibrationEffect implements Parcelable { 
     * 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 @@ public abstract class VibrationEffect implements Parcelable { 
    }



    /** @hide */

    @TestApi

    public static class Waveform extends VibrationEffect implements Parcelable {

        private final long[] mTimings;

        private final int[] mAmplitudes;
@@ -576,6 +581,7 @@ public abstract class VibrationEffect implements Parcelable { 
    }



    /** @hide */

    @TestApi

    public static class Prebaked extends VibrationEffect implements Parcelable {

        private final int mEffectId;

        private final boolean mFallback;