diff options
| author | 2021-04-27 14:55:45 +0000 | |
|---|---|---|
| committer | 2021-04-27 14:55:45 +0000 | |
| commit | a97407bcc87a875a8f170a13bb3c50d778c680f9 (patch) | |
| tree | 831be4abd1717857fbb7c1532a7554c05ff52ae7 | |
| parent | 8231960159dc3276a6f3056daf855a1f0bb3f49b (diff) | |
Fix NPE on VibratorInfo.getPrimitiveDuration
Fix: 186469012
Test: VibratorInfoTest
Change-Id: I2145bd95ad23040a583a347e9a1f4cff2a40e8c2
| -rw-r--r-- | core/java/android/os/VibratorInfo.java | 2 | ||||
| -rw-r--r-- | core/tests/coretests/src/android/os/VibratorInfoTest.java | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/os/VibratorInfo.java b/core/java/android/os/VibratorInfo.java index d73469ca7e8e..597df0811e20 100644 --- a/core/java/android/os/VibratorInfo.java +++ b/core/java/android/os/VibratorInfo.java @@ -260,7 +260,7 @@ public class VibratorInfo implements Parcelable { */ public int getPrimitiveDuration( @VibrationEffect.Composition.PrimitiveType int primitiveId) { - return mSupportedPrimitives.get(primitiveId); + return mSupportedPrimitives != null ? mSupportedPrimitives.get(primitiveId) : 0; } /** diff --git a/core/tests/coretests/src/android/os/VibratorInfoTest.java b/core/tests/coretests/src/android/os/VibratorInfoTest.java index 9880f8c52971..8c7d10c7a5ef 100644 --- a/core/tests/coretests/src/android/os/VibratorInfoTest.java +++ b/core/tests/coretests/src/android/os/VibratorInfoTest.java @@ -108,6 +108,8 @@ public class VibratorInfoTest { .build(); assertEquals(20, info.getPrimitiveDuration(VibrationEffect.Composition.PRIMITIVE_CLICK)); assertEquals(0, info.getPrimitiveDuration(VibrationEffect.Composition.PRIMITIVE_TICK)); + assertEquals(0, new VibratorInfo.Builder(TEST_VIBRATOR_ID).build() + .getPrimitiveDuration(VibrationEffect.Composition.PRIMITIVE_TICK)); } @Test |