DO NOT MERGE Hide vibrator streamHint overloads for preview.

Bug:15192966
Change-Id: I25f57053b6f62fb627ae4f451d5f64ee77b8eba0

diff --git a/api/current.txt b/api/current.txt
index a829bdf..3720f1d 100644 (file)
--- a/api/current.txt
+++ b/api/current.txt
@@ -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 {

diff --git a/core/java/android/os/Vibrator.java b/core/java/android/os/Vibrator.java
index c1d4d4c..cb0f142 100644 (file)
--- a/core/java/android/os/Vibrator.java
+++ b/core/java/android/os/Vibrator.java
@@ -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);