Merge "DO NOT MERGE Hide vibrator streamHint overloads for preview." into lmp-preview-dev

This commit is contained in:
John Spurlock
2014-05-27 15:13:33 +00:00
committed by Android (Google) Code Review
2 changed files with 2 additions and 2 deletions

View File

@@ -21693,9 +21693,7 @@ package android.os {
method public abstract void cancel();
method public abstract boolean hasVibrator();
method public void vibrate(long);
method public void vibrate(long, int);
method public void vibrate(long[], int);
method public void vibrate(long[], int, int);
}
public class WorkSource implements android.os.Parcelable {

View File

@@ -74,6 +74,7 @@ public abstract class Vibrator {
* @param streamHint An {@link AudioManager} stream type corresponding to the vibration type.
* For example, specify {@link AudioManager#STREAM_ALARM} for alarm vibrations or
* {@link AudioManager#STREAM_RING} for vibrations associated with incoming calls.
* @hide
*/
public void vibrate(long milliseconds, int streamHint) {
vibrate(Process.myUid(), mPackageName, milliseconds, streamHint);
@@ -125,6 +126,7 @@ public abstract class Vibrator {
* @param streamHint An {@link AudioManager} stream type corresponding to the vibration type.
* For example, specify {@link AudioManager#STREAM_ALARM} for alarm vibrations or
* {@link AudioManager#STREAM_RING} for vibrations associated with incoming calls.
* @hide
*/
public void vibrate(long[] pattern, int repeat, int streamHint) {
vibrate(Process.myUid(), mPackageName, pattern, repeat, streamHint);