PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix volume panel crashing

Browse Source 
slider position is smaller than min value causes the exception.
Fixed by limit the position within min and max value.

Fixes: 148270968
Fixes: 149973990
Test: manual
Change-Id: I3d162f6d2f1035b81b1b2eb915b488084e7ea36e
(cherry picked from commit fcd9f1a870)
Merged-In: I3d162f6d2f1035b81b1b2eb915b488084e7ea36e
This commit is contained in:
Raff Tsai
2020-01-30 08:22:09 +08:00
committed by Tsung-Mao Fang
parent 936ebd0367
commit ef009cc832
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/slices/SliceBuilderUtils.java
View File

@@ -313,6 +313,14 @@ public class SliceBuilderUtils {
ListBuilder.ICON_IMAGE, sliceData.getTitle()); ListBuilder.ICON_IMAGE, sliceData.getTitle());
final Set<String> keywords = buildSliceKeywords(sliceData); final Set<String> keywords = buildSliceKeywords(sliceData);
int cur = sliderController.getSliderPosition();
if (cur < sliderController.getMin()) {
cur = sliderController.getMin();
}
if (cur > sliderController.getMax()) {
cur = sliderController.getMax();
}
return new ListBuilder(context, sliceData.getUri(), ListBuilder.INFINITY) return new ListBuilder(context, sliceData.getUri(), ListBuilder.INFINITY)
.setAccentColor(color) .setAccentColor(color)
.addInputRange(new InputRangeBuilder() .addInputRange(new InputRangeBuilder()
@@ -321,7 +329,7 @@ public class SliceBuilderUtils {
.setPrimaryAction(primaryAction) .setPrimaryAction(primaryAction)
.setMax(sliderController.getMax()) .setMax(sliderController.getMax())
.setMin(sliderController.getMin()) .setMin(sliderController.getMin())
.setValue(sliderController.getSliderPosition()) .setValue(cur)
.setInputAction(actionIntent)) .setInputAction(actionIntent))
.setKeywords(keywords) .setKeywords(keywords)
.build(); .build();