Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2021-04-27 18:12:51 +00:00
committed by Android (Google) Code Review
parent 8fad5d86b9 a97407bcc8
commit f10473c64c
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/os/VibratorInfo.java
View File

@@ -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;
}
/**

2
core/tests/coretests/src/android/os/VibratorInfoTest.java
View File

@@ -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