Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a97407bc authored by Lais Andrade's avatar Lais Andrade
Browse files

Fix NPE on VibratorInfo.getPrimitiveDuration 

Fix: 186469012
Test: VibratorInfoTest
Change-Id: I2145bd95ad23040a583a347e9a1f4cff2a40e8c2
parent 82319601

core/java/android/os/VibratorInfo.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

    }



    /**

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

+2 −0
Original line number Diff line number Diff line
@@ -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