commit f10473c64ccafb9a1a2d20432d228c01c118159d
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Apr 27 18:12:51 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 27 18:12:51 2021 +0000
tree 6b18226e079f43199354ad8c5b1a389faaafe7c3
parent 8fad5d86b97f21c7bb585c678b9e938966bc66c0
parent a97407bcc87a875a8f170a13bb3c50d778c680f9

Merge "Fix NPE on VibratorInfo.getPrimitiveDuration" into sc-dev

core/java/android/os/VibratorInfo.java

diff --git a/core/java/android/os/VibratorInfo.java b/core/java/android/os/VibratorInfo.java
index d73469c..597df08 100644
--- a/core/java/android/os/VibratorInfo.java
+++ b/core/java/android/os/VibratorInfo.java
@@ -260,7 +260,7 @@
      */
     public int getPrimitiveDuration(
             @VibrationEffect.Composition.PrimitiveType int primitiveId) {
-        return mSupportedPrimitives.get(primitiveId);
+        return mSupportedPrimitives != null ? mSupportedPrimitives.get(primitiveId) : 0;
     }
 
     /**

core/tests/coretests/src/android/os/VibratorInfoTest.java

diff --git a/core/tests/coretests/src/android/os/VibratorInfoTest.java b/core/tests/coretests/src/android/os/VibratorInfoTest.java
index 9880f8c..8c7d10c 100644
--- a/core/tests/coretests/src/android/os/VibratorInfoTest.java
+++ b/core/tests/coretests/src/android/os/VibratorInfoTest.java
@@ -108,6 +108,8 @@
                 .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