am 4f5555ab: am b80b8bb2: Merge "Fixes an AIOOBE when device admin enforces a small timeout for screen lock" into jb-mr1-dev
* commit '4f5555ab9355e0b51a9858668aab8538e29d658c':
Fixes an AIOOBE when device admin enforces a small timeout for screen lock
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index 9f812fe..fb839a7 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -154,15 +154,19 @@
} 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);
}