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

Commit dca03676 authored by Yeabkal Wubshit's avatar Yeabkal Wubshit Committed by Android (Google) Code Review
Browse files

Merge "Support vibration-select parsing" into main

parents 653581a0 c908e136

core/api/test-current.txt

+7 −1
Original line number Diff line number Diff line
@@ -2704,8 +2704,14 @@ package android.os.vibrator { 


package android.os.vibrator.persistence {



  public class ParsedVibration {

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

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

  }



  public final class VibrationXmlParser {

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

    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 {

core/java/android/hardware/input/InputDeviceVibrator.java

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ final class InputDeviceVibrator extends Vibrator { 
    }



    @Override

    protected VibratorInfo getInfo() {

    public VibratorInfo getInfo() {

        return mVibratorInfo;

    }

core/java/android/os/SystemVibrator.java

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ public class SystemVibrator extends Vibrator { 
    }



    @Override

    protected VibratorInfo getInfo() {

    public VibratorInfo getInfo() {

        synchronized (mLock) {

            if (mVibratorInfo != null) {

                return mVibratorInfo;

core/java/android/os/SystemVibratorManager.java

+1 −1
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ public class SystemVibratorManager extends VibratorManager { 
        }



        @Override

        protected VibratorInfo getInfo() {

        public VibratorInfo getInfo() {

            return mVibratorInfo;

        }

core/java/android/os/Vibrator.java

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ public abstract class Vibrator { 
     *

     * @hide

     */

    protected VibratorInfo getInfo() {

    public VibratorInfo getInfo() {

        return VibratorInfo.EMPTY_VIBRATOR_INFO;

    }