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

Commit 4625fe13 authored by Lais Andrade's avatar Lais Andrade Committed by Android (Google) Code Review
Browse files

Merge "Add @FlaggedApi to android.os.vibrator.persistence classes" into main

parents 04519bed 58ff428b

core/api/test-current.txt

+3 −3
Original line number Diff line number Diff line
@@ -2612,17 +2612,17 @@ package android.os.vibrator { 


package android.os.vibrator.persistence {



  public class ParsedVibration {

  @FlaggedApi("android.os.vibrator.enable_vibration_serialization_apis") public class ParsedVibration {

    method @NonNull public java.util.List<android.os.VibrationEffect> getVibrationEffects();

    method @Nullable public android.os.VibrationEffect resolve(@NonNull android.os.Vibrator);

  }



  public final class VibrationXmlParser {

  @FlaggedApi("android.os.vibrator.enable_vibration_serialization_apis") public final class VibrationXmlParser {

    method @Nullable public static android.os.vibrator.persistence.ParsedVibration parseDocument(@NonNull java.io.Reader) throws java.io.IOException;

    method @Nullable public static android.os.VibrationEffect parseVibrationEffect(@NonNull java.io.Reader) throws java.io.IOException;

  }



  public final class VibrationXmlSerializer {

  @FlaggedApi("android.os.vibrator.enable_vibration_serialization_apis") public final class VibrationXmlSerializer {

    method public static void serialize(@NonNull android.os.VibrationEffect, @NonNull java.io.Writer) throws java.io.IOException, android.os.vibrator.persistence.VibrationXmlSerializer.SerializationFailedException;

  }

core/java/android/os/vibrator/flags.aconfig

+8 −1
Original line number Diff line number Diff line
@@ -20,3 +20,10 @@ flag { 
    description: "Enables the usage of the new RingtoneV2 class"

    bug: "241918098"

}



flag {

    namespace: "haptics"

    name: "enable_vibration_serialization_apis"

    description: "Enables the APIs for vibration serialization/deserialization."

    bug: "245129509"

}

core/java/android/os/vibrator/persistence/ParsedVibration.java

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.os.vibrator.persistence;



import android.annotation.FlaggedApi;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.TestApi;
@@ -34,6 +35,7 @@ import java.util.List; 
 *

 * @hide

 */

@FlaggedApi(android.os.vibrator.Flags.FLAG_ENABLE_VIBRATION_SERIALIZATION_APIS)

@TestApi

public class ParsedVibration {

    private final List<VibrationEffect> mEffects;

core/java/android/os/vibrator/persistence/VibrationXmlParser.java

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.os.vibrator.persistence;



import android.annotation.FlaggedApi;

import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.Nullable;
@@ -115,6 +116,7 @@ import java.util.List; 
 *

 * @hide

 */

@FlaggedApi(android.os.vibrator.Flags.FLAG_ENABLE_VIBRATION_SERIALIZATION_APIS)

@TestApi

public final class VibrationXmlParser {

    private static final String TAG = "VibrationXmlParser";

core/java/android/os/vibrator/persistence/VibrationXmlSerializer.java

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.os.vibrator.persistence;



import android.annotation.FlaggedApi;

import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.TestApi;
@@ -42,6 +43,7 @@ import java.lang.annotation.RetentionPolicy; 
 *

 * @hide

 */

@FlaggedApi(android.os.vibrator.Flags.FLAG_ENABLE_VIBRATION_SERIALIZATION_APIS)

@TestApi

public final class VibrationXmlSerializer {