diff options
| author | Yixiao Luo <yixiaoluo@google.com> | 2023-12-13 17:11:59 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-12-13 17:11:59 +0000 |
| commit | 9738805ffd06d07e53d99611cc5647b05bee6e36 (patch) | |
| tree | bc56dca9bcfe376d600a8bb37c73658efc19909b | |
| parent | eb72a52439cf4d86f43e999ac0dc61d2acdaf8f2 (diff) | |
| parent | 75233d5658dc3134f23aa189f63904d0a2f9d357 (diff) | |
| download | Permission-9738805ffd06d07e53d99611cc5647b05bee6e36.tar.gz | |
Merge "VibratorManager: Add check to testVibrator" into main
| -rw-r--r-- | tests/cts/permission/src/android/permission/cts/NoSystemFunctionPermissionTest.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tests/cts/permission/src/android/permission/cts/NoSystemFunctionPermissionTest.java b/tests/cts/permission/src/android/permission/cts/NoSystemFunctionPermissionTest.java index 37f47a877..51b3bd830 100644 --- a/tests/cts/permission/src/android/permission/cts/NoSystemFunctionPermissionTest.java +++ b/tests/cts/permission/src/android/permission/cts/NoSystemFunctionPermissionTest.java @@ -24,6 +24,7 @@ import android.content.Context; import android.content.pm.PackageManager; import android.graphics.Bitmap; import android.os.Vibrator; +import android.os.VibratorManager; import android.platform.test.annotations.AppModeFull; import android.telephony.gsm.SmsManager; import android.test.AndroidTestCase; @@ -121,7 +122,12 @@ public class NoSystemFunctionPermissionTest extends AndroidTestCase { */ @SmallTest public void testVibrator() { - Vibrator vibrator = (Vibrator)getContext().getSystemService(Context.VIBRATOR_SERVICE); + Vibrator vibrator = mContext.getSystemService(VibratorManager.class).getDefaultVibrator(); + + if (!vibrator.hasVibrator()) { + // Run the test only if a vibrator is present. + return; + } if (!vibrator.hasVibrator()) { // If the test device does not have a vibrator, then abort test. |