Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Catch exceptions in Vibrator to maintain compatibility" into oc-dev

Browse Source 
am: 07d60cce02

Change-Id: I84ee1eddc5a2ae67e1da6de5ad84721714bcd79f
This commit is contained in:
Michael Wright
2017-04-13 06:55:21 +00:00
committed by android-build-merger
parent 3395e15204 07d60cce02
commit 49f1db32ef
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/java/android/os/Vibrator.java
View File

@@ -19,6 +19,7 @@ package android.os;
import android.app.ActivityThread;
import android.content.Context;
import android.media.AudioAttributes;
import android.util.Log;
/**
* Class that operates the vibrator on the device.
@@ -30,6 +31,7 @@ import android.media.AudioAttributes;
* {@link Context#getSystemService} with {@link Context#VIBRATOR_SERVICE} as the argument.
*/
public abstract class Vibrator {
private static final String TAG = "Vibrator";
private final String mPackageName;
@@ -90,9 +92,14 @@ public abstract class Vibrator {
*/
@Deprecated
public void vibrate(long milliseconds, AudioAttributes attributes) {
VibrationEffect effect =
VibrationEffect.createOneShot(milliseconds, VibrationEffect.DEFAULT_AMPLITUDE);
vibrate(effect, attributes);
try {
// This ignores all exceptions to stay compatible with pre-O implementations.
VibrationEffect effect =
VibrationEffect.createOneShot(milliseconds, VibrationEffect.DEFAULT_AMPLITUDE);
vibrate(effect, attributes);
} catch (IllegalArgumentException iae) {
Log.e(TAG, "Failed to create VibrationEffect", iae);
}
}
/**
@@ -150,12 +157,17 @@ public abstract class Vibrator {
*/
@Deprecated
public void vibrate(long[] pattern, int repeat, AudioAttributes attributes) {
// This call needs to continue throwing ArrayIndexOutOfBoundsException for compatibility
// purposes, whereas VibrationEffect throws an IllegalArgumentException.
// This call needs to continue throwing ArrayIndexOutOfBoundsException but ignore all other
// exceptions for compatibility purposes
if (repeat < -1 || repeat >= pattern.length) {
throw new ArrayIndexOutOfBoundsException();
}
vibrate(VibrationEffect.createWaveform(pattern, repeat), attributes);
try {
vibrate(VibrationEffect.createWaveform(pattern, repeat), attributes);
} catch (IllegalArgumentException iae) {
Log.e(TAG, "Failed to create VibrationEffect", iae);
}
}
public void vibrate(VibrationEffect vibe) {