OSDN Git Service

Fix 2582241: Update selection based on user setting instead.
authorJim Miller <jaggies@google.com>
Tue, 13 Apr 2010 22:31:41 +0000 (15:31 -0700)
committerJim Miller <jaggies@google.com>
Tue, 13 Apr 2010 22:31:41 +0000 (15:31 -0700)
commitfc5a02225e8bca21f07543f55e1b51a33670c501
treefb49303a8a2b1db1fa556335b29e78c0e989e6fc
parentfced126829a74c9cbe9cbe993a3c54d1ff015a73
Fix 2582241: Update selection based on user setting instead.

When the user adds a DPM, Settings removes all display
timeout options with t > maxTimeout. It was incorrectly
setting the preference to maxTimeout.

The corrected code picks the user's preference if less
than maxTimeout or nothing otherwise.

Change-Id: I5a47fdce89f4cf216fd76bb585c3c0120b39db92
src/com/android/settings/DisplaySettings.java