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

Commit 960e0e9b authored by Adrian Roos's avatar Adrian Roos Committed by Android (Google) Code Review
Browse files

Merge "haptics: remove enable_vibration_serialization_apis" into main

parents cdccb633 869c3f74

core/api/test-current.txt

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


package android.os.vibrator.persistence {



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

  public class ParsedVibration {

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

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

  }



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

  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;

  }



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

  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

+0 −7
Original line number Diff line number Diff line
@@ -14,13 +14,6 @@ flag { 
    bug: "241918098"

}



flag {

    namespace: "haptics"

    name: "enable_vibration_serialization_apis"

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

    bug: "245129509"

}



flag {

    namespace: "haptics"

    name: "haptic_feedback_vibration_oem_customization_enabled"

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

+2 −2
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ 


package android.os.vibrator.persistence;



import android.annotation.FlaggedApi;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SuppressLint;

import android.annotation.TestApi;

import android.os.VibrationEffect;

import android.os.Vibrator;
@@ -35,8 +35,8 @@ import java.util.List; 
 *

 * @hide

 */

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

@TestApi

@SuppressLint("UnflaggedApi") // @TestApi without associated feature.

public class ParsedVibration {

    private final List<VibrationEffect> mEffects;

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

+2 −2
Original line number Diff line number Diff line
@@ -16,10 +16,10 @@ 


package android.os.vibrator.persistence;



import android.annotation.FlaggedApi;

import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SuppressLint;

import android.annotation.TestApi;

import android.os.VibrationEffect;

import android.util.Slog;
@@ -116,8 +116,8 @@ import java.util.List; 
 *

 * @hide

 */

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

@TestApi

@SuppressLint("UnflaggedApi") // @TestApi without associated feature.

public final class VibrationXmlParser {

    private static final String TAG = "VibrationXmlParser";

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

+2 −2
Original line number Diff line number Diff line
@@ -16,9 +16,9 @@ 


package android.os.vibrator.persistence;



import android.annotation.FlaggedApi;

import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.SuppressLint;

import android.annotation.TestApi;

import android.os.CombinedVibration;

import android.os.VibrationEffect;
@@ -43,8 +43,8 @@ import java.lang.annotation.RetentionPolicy; 
 *

 * @hide

 */

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

@TestApi

@SuppressLint("UnflaggedApi") // @TestApi without associated feature.

public final class VibrationXmlSerializer {



    /**