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

Commit f9e1a0b3 authored by John Spurlock's avatar John Spurlock
Browse files

Annotate framework vibrate calls with stream hints. 

Migrate existing framework usages of Vibrator.vibrate to use
the new overload with an explicit stream hint.  This prevents
them from being blocked by rules targeting the unspecified stream.

For calls that pass the existing appops check in VibrateService,
pass streamHint down to the input device vibrator so we don't lose
the signal, but leave it up to InputManager to decide what to do
with it - currently unused.

Change-Id: I65c944e4010edea29a412bf57d8d7d3b8098b746
parent e003e7e8

core/java/android/view/VolumePanel.java

+1 −1
Original line number Diff line number Diff line
@@ -787,7 +787,7 @@ public class VolumePanel extends Handler implements OnSeekBarChangeListener, Vie 
            return;

        }



        mVibrator.vibrate(VIBRATE_DURATION);

        mVibrator.vibrate(VIBRATE_DURATION, AudioManager.STREAM_SYSTEM);

    }



    protected void onRemoteVolumeChanged(int streamType, int flags) {

core/java/com/android/internal/widget/RotarySelector.java

+4 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.graphics.Paint; 
import android.graphics.Bitmap;

import android.graphics.BitmapFactory;

import android.graphics.Matrix;

import android.media.AudioManager;

import android.os.UserHandle;

import android.os.Vibrator;

import android.provider.Settings;
@@ -34,7 +35,9 @@ import android.view.View; 
import android.view.VelocityTracker;

import android.view.ViewConfiguration;

import android.view.animation.DecelerateInterpolator;



import static android.view.animation.AnimationUtils.currentAnimationTimeMillis;



import com.android.internal.R;
@@ -676,7 +679,7 @@ public class RotarySelector extends View { 
                mVibrator = (android.os.Vibrator) getContext()

                        .getSystemService(Context.VIBRATOR_SERVICE);

            }

            mVibrator.vibrate(duration);

            mVibrator.vibrate(duration, AudioManager.STREAM_SYSTEM);

        }

    }

core/java/com/android/internal/widget/SlidingTab.java

+2 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.content.res.Resources; 
import android.content.res.TypedArray;

import android.graphics.Rect;

import android.graphics.drawable.Drawable;

import android.media.AudioManager;

import android.os.UserHandle;

import android.os.Vibrator;

import android.provider.Settings;
@@ -821,7 +822,7 @@ public class SlidingTab extends ViewGroup { 
                mVibrator = (android.os.Vibrator) getContext()

                        .getSystemService(Context.VIBRATOR_SERVICE);

            }

            mVibrator.vibrate(duration);

            mVibrator.vibrate(duration, AudioManager.STREAM_SYSTEM);

        }

    }

core/java/com/android/internal/widget/WaveView.java

+2 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.graphics.Bitmap; 
import android.graphics.BitmapFactory;

import android.graphics.Canvas;

import android.graphics.drawable.BitmapDrawable;

import android.media.AudioManager;

import android.os.UserHandle;

import android.os.Vibrator;

import android.provider.Settings;
@@ -582,7 +583,7 @@ public class WaveView extends View implements ValueAnimator.AnimatorUpdateListen 
                mVibrator = (android.os.Vibrator) getContext()

                        .getSystemService(Context.VIBRATOR_SERVICE);

            }

            mVibrator.vibrate(duration);

            mVibrator.vibrate(duration, AudioManager.STREAM_SYSTEM);

        }

    }

core/java/com/android/internal/widget/multiwaveview/GlowPadView.java

+2 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.content.res.Resources; 
import android.content.res.TypedArray;

import android.graphics.Canvas;

import android.graphics.drawable.Drawable;

import android.media.AudioManager;

import android.os.Bundle;

import android.os.UserHandle;

import android.os.Vibrator;
@@ -564,7 +565,7 @@ public class GlowPadView extends View { 
                mContext.getContentResolver(), Settings.System.HAPTIC_FEEDBACK_ENABLED, 1,

                UserHandle.USER_CURRENT) != 0;

        if (mVibrator != null && hapticEnabled) {

            mVibrator.vibrate(mVibrationDuration);

            mVibrator.vibrate(mVibrationDuration, AudioManager.STREAM_SYSTEM);

        }

    }