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

Commit f10473c6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 8fad5d86 a97407bc

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