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

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

Browse Source
This commit is contained in:
Amith Yamasani
2012-10-22 17:56:54 -07:00
committed by Android (Google) Code Review
parent a7acb166b2 64516a191f
commit b80b8bb253
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/android/settings/DisplaySettings.java
View File

@@ -154,15 +154,19 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
} else {
final CharSequence[] entries = preference.getEntries();
final CharSequence[] values = preference.getEntryValues();
int best = 0;
for (int i = 0; i < values.length; i++) {
long timeout = Long.parseLong(values[i].toString());
if (currentTimeout >= timeout) {
best = i;
if (entries == null || entries.length == 0) {
summary = "";
} else {
int best = 0;
for (int i = 0; i < values.length; i++) {
long timeout = Long.parseLong(values[i].toString());
if (currentTimeout >= timeout) {
best = i;
}
}
summary = preference.getContext().getString(R.string.screen_timeout_summary,
entries[best]);
}
summary = preference.getContext().getString(R.string.screen_timeout_summary,
entries[best]);
}
preference.setSummary(summary);
}