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

Commit 4f5555ab authored by Amith Yamasani's avatar Amith Yamasani Committed by Android Git Automerger
Browse files

am b80b8bb2: Merge "Fixes an AIOOBE when device admin enforces a small timeout... 

am b80b8bb2: Merge "Fixes an AIOOBE when device admin enforces a small timeout for screen lock" into jb-mr1-dev

* commit 'b80b8bb2':
  Fixes an AIOOBE when device admin enforces a small timeout for screen lock
parents 2d962955 b80b8bb2

src/com/android/settings/DisplaySettings.java

+11 −7
Original line number Original line Diff line number Diff line
@@ -154,6 +154,9 @@ public class DisplaySettings extends SettingsPreferenceFragment implements 
        } else {

        } else {

            final CharSequence[] entries = preference.getEntries();

            final CharSequence[] entries = preference.getEntries();

            final CharSequence[] values = preference.getEntryValues();

            final CharSequence[] values = preference.getEntryValues();

            if (entries == null || entries.length == 0) {

                summary = "";

            } else {

                int best = 0;

                int best = 0;

                for (int i = 0; i < values.length; i++) {

                for (int i = 0; i < values.length; i++) {

                    long timeout = Long.parseLong(values[i].toString());

                    long timeout = Long.parseLong(values[i].toString());
@@ -164,6 +167,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements 
                summary = preference.getContext().getString(R.string.screen_timeout_summary,

                summary = preference.getContext().getString(R.string.screen_timeout_summary,

                        entries[best]);

                        entries[best]);

            }

            }

        }

        preference.setSummary(summary);

        preference.setSummary(summary);

    }

    }