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

Commit face5b6c authored by Ken Lin's avatar Ken Lin Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24109923



Change-Id: I5554e3263baf46c64ba2286a80e5cb83da5d4098
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6da21a67 a6f2464e

src/com/android/settings/display/ScreenResolutionFragment.java

+6 −0
Original line number Diff line number Diff line
@@ -369,6 +369,12 @@ public class ScreenResolutionFragment extends RadioButtonPickerFragment { 


        private void restoreDensity() {

            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]

                    != density.getDefaultDensityForDefaultDisplay()) {

                density.setForcedDisplayDensity(mCurrentIndex);