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

Commit c0819d20 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add an optional reason field to vibrator service"

parents d708a456 e1f06b88

core/java/android/hardware/input/InputManager.java

+2 −2
Original line number Diff line number Diff line
@@ -1191,8 +1191,8 @@ public final class InputManager { 
         * @hide

         */

        @Override

        public void vibrate(int uid, String opPkg,

                VibrationEffect effect, AudioAttributes attributes) {

        public void vibrate(int uid, String opPkg, VibrationEffect effect,

                String reason, AudioAttributes attributes) {

            long[] pattern;

            int repeat;

            if (effect instanceof VibrationEffect.OneShot) {

core/java/android/os/IVibratorService.aidl

+2 −1
Original line number Diff line number Diff line
@@ -23,7 +23,8 @@ interface IVibratorService 
{

    boolean hasVibrator();

    boolean hasAmplitudeControl();

    void vibrate(int uid, String opPkg, in VibrationEffect effect, int usageHint, IBinder token);

    void vibrate(int uid, String opPkg, in VibrationEffect effect, int usageHint, String reason,

            IBinder token);

    void cancelVibrate(IBinder token);

}

core/java/android/os/NullVibrator.java

+2 −2
Original line number Diff line number Diff line
@@ -44,8 +44,8 @@ public class NullVibrator extends Vibrator { 
    }



    @Override

    public void vibrate(int uid, String opPkg,

            VibrationEffect effect, AudioAttributes attributes) {

    public void vibrate(int uid, String opPkg, VibrationEffect effect,

            String reason, AudioAttributes attributes) {

    }



    @Override

core/java/android/os/SystemVibrator.java

+3 −3
Original line number Diff line number Diff line
@@ -67,14 +67,14 @@ public class SystemVibrator extends Vibrator { 
    }



    @Override

    public void vibrate(int uid, String opPkg,

            VibrationEffect effect, AudioAttributes attributes) {

    public void vibrate(int uid, String opPkg, VibrationEffect effect,

            String reason, AudioAttributes attributes) {

        if (mService == null) {

            Log.w(TAG, "Failed to vibrate; no vibrator service.");

            return;

        }

        try {

            mService.vibrate(uid, opPkg, effect, usageForAttributes(attributes), mToken);

            mService.vibrate(uid, opPkg, effect, usageForAttributes(attributes), reason, mToken);

        } catch (RemoteException e) {

            Log.w(TAG, "Failed to vibrate.", e);

        }

core/java/android/os/Vibrator.java

+5 −5
Original line number Diff line number Diff line
@@ -248,17 +248,17 @@ public abstract class Vibrator { 


    @RequiresPermission(android.Manifest.permission.VIBRATE)

    public void vibrate(VibrationEffect vibe, AudioAttributes attributes) {

        vibrate(Process.myUid(), mPackageName, vibe, attributes);

        vibrate(Process.myUid(), mPackageName, vibe, null, attributes);

    }



    /**

     * Like {@link #vibrate(VibrationEffect, AudioAttributes)}, but allowing the caller to specify

     * that the vibration is owned by someone else.

     * Like {@link #vibrate(int, String, VibrationEffect, AudioAttributes)}, but allows the

     * caller to specify the vibration is owned by someone else and set reason for vibration.

     * @hide

     */

    @RequiresPermission(android.Manifest.permission.VIBRATE)

    public abstract void vibrate(int uid, String opPkg,

            VibrationEffect vibe, AudioAttributes attributes);

    public abstract void vibrate(int uid, String opPkg, VibrationEffect vibe,

            String reason, AudioAttributes attributes);



    /**

     * Turn the vibrator off.