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

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

Browse Source 
* commit 'b80b8bb2535504bada0664a7255b5fa61c2c3947':
  Fixes an AIOOBE when device admin enforces a small timeout for screen lock
This commit is contained in:
Amith Yamasani
2012-10-22 17:59:10 -07:00
committed by Android Git Automerger
parent 2d9629557d b80b8bb253
commit 4f5555ab93
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 { } else {
final CharSequence[] entries = preference.getEntries(); final CharSequence[] entries = preference.getEntries();
final CharSequence[] values = preference.getEntryValues(); final CharSequence[] values = preference.getEntryValues();
int best = 0; if (entries == null || entries.length == 0) {
for (int i = 0; i < values.length; i++) { summary = "";
long timeout = Long.parseLong(values[i].toString()); } else {
if (currentTimeout >= timeout) { int best = 0;
best = i; 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); preference.setSummary(summary);
} }