Merge "Settings crashed when changing the Screen Resolution" into udc-d1-dev

This commit is contained in:
Ken Lin
2023-07-19 03:58:47 +00:00
committed by Android (Google) Code Review

View File

@@ -369,6 +369,12 @@ public class ScreenResolutionFragment extends RadioButtonPickerFragment {
private void restoreDensity() { private void restoreDensity() {
final DisplayDensityUtils density = new DisplayDensityUtils(mContext); final DisplayDensityUtils density = new DisplayDensityUtils(mContext);
/* If current density is the same as a default density of other resolutions,
* then mCurrentIndex may be out of boundary.
*/
if (density.getDefaultDisplayDensityValues().length <= mCurrentIndex) {
mCurrentIndex = density.getCurrentIndexForDefaultDisplay();
}
if (density.getDefaultDisplayDensityValues()[mCurrentIndex] if (density.getDefaultDisplayDensityValues()[mCurrentIndex]
!= density.getDefaultDensityForDefaultDisplay()) { != density.getDefaultDensityForDefaultDisplay()) {
density.setForcedDisplayDensity(mCurrentIndex); density.setForcedDisplayDensity(mCurrentIndex);