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

Commit 5ab53793 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove android.os.vibrator.vibration_xml_apis" into main

parents f2fda488 9c415a5e

core/api/system-current.txt

+5 −5
Original line number Diff line number Diff line
@@ -12389,13 +12389,13 @@ package android.os.vibrator { 














package android.os.vibrator.persistence {



























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













    method @FlaggedApi("android.os.vibrator.vibration_xml_apis") @Nullable public android.os.VibrationEffect resolve(@NonNull android.os.Vibrator);













  public final class ParsedVibration {













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















  }



























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













    method @FlaggedApi("android.os.vibrator.vibration_xml_apis") @NonNull public static android.os.vibrator.persistence.ParsedVibration parse(@NonNull java.io.InputStream) throws java.io.IOException;













    method @FlaggedApi("android.os.vibrator.vibration_xml_apis") @NonNull public static android.os.VibrationEffect parseVibrationEffect(@NonNull java.io.InputStream) throws java.io.IOException;













  public final class VibrationXmlParser {













    method @NonNull public static android.os.vibrator.persistence.ParsedVibration parse(@NonNull java.io.InputStream) throws java.io.IOException;













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















  }





























}

























core/api/test-current.txt



+1
−1




























Original line number
Diff line number
Diff line








@@ -2985,7 +2985,7 @@ package android.os.vibrator {





























package android.os.vibrator.persistence {





























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













  public final class ParsedVibration {















    ctor public ParsedVibration(@NonNull java.util.List<android.os.VibrationEffect>);















  }

















































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



+0
−11




























Original line number
Diff line number
Diff line















package: "android.os.vibrator"















container: "system"





























flag {













    namespace: "haptics"













    name: "vibration_xml_apis"













    is_exported: true













    description: "Enabled System APIs for vibration effect XML parser and serializer"













    bug: "347273158"













    metadata {













        purpose: PURPOSE_FEATURE













    }













}





























flag {















    namespace: "haptics"















    name: "vendor_vibration_effects"

































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



+0
−5




























Original line number
Diff line number
Diff line








@@ -16,9 +16,6 @@





























package android.os.vibrator.persistence;





























import static android.os.vibrator.Flags.FLAG_VIBRATION_XML_APIS;



























import android.annotation.FlaggedApi;















import android.annotation.NonNull;















import android.annotation.Nullable;















import android.annotation.SystemApi;









@@ -39,7 +36,6 @@ import java.util.Objects;













 * @hide















 */















@SystemApi













@FlaggedApi(FLAG_VIBRATION_XML_APIS)















public final class ParsedVibration {















    private final ArrayList<VibrationEffect> mEffects;

























@@ -62,7 +58,6 @@ public final class ParsedVibration {













     * @hide















     */















    @SystemApi













    @FlaggedApi(FLAG_VIBRATION_XML_APIS)















    @Nullable















    public VibrationEffect resolve(@NonNull Vibrator vibrator) {















        return resolve(vibrator.getInfo());

































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



+0
−6




























Original line number
Diff line number
Diff line








@@ -16,9 +16,6 @@





























package android.os.vibrator.persistence;





























import static android.os.vibrator.Flags.FLAG_VIBRATION_XML_APIS;



























import android.annotation.FlaggedApi;















import android.annotation.IntDef;















import android.annotation.NonNull;















import android.annotation.Nullable;










@@ -122,7 +119,6 @@ import java.util.List;













 * @hide















 */















@SystemApi













@FlaggedApi(FLAG_VIBRATION_XML_APIS)















public final class VibrationXmlParser {































    /**










@@ -195,7 +191,6 @@ public final class VibrationXmlParser {













     * @hide















     */















    @SystemApi













    @FlaggedApi(FLAG_VIBRATION_XML_APIS)















    @NonNull















    public static ParsedVibration parse(@NonNull InputStream inputStream) throws IOException {















        return parseDocument(new InputStreamReader(inputStream, StandardCharsets.UTF_8));









@@ -216,7 +211,6 @@ public final class VibrationXmlParser {













     * @hide















     */















    @SystemApi













    @FlaggedApi(FLAG_VIBRATION_XML_APIS)















    @NonNull















    public static VibrationEffect parseVibrationEffect(@NonNull InputStream inputStream)















            throws IOException {