Merge "Update view state of the items in listpreference."
diff --git a/src/com/android/settings/RestrictedListPreference.java b/src/com/android/settings/RestrictedListPreference.java
index 35ee30d..77af19e 100644
--- a/src/com/android/settings/RestrictedListPreference.java
+++ b/src/com/android/settings/RestrictedListPreference.java
@@ -146,11 +146,10 @@
             ImageView padlock = (ImageView) root.findViewById(R.id.restricted_lock_icon);
             if (isRestrictedForEntry(entry)) {
                 text.setEnabled(false);
+                text.setChecked(false);
                 padlock.setVisibility(View.VISIBLE);
             } else {
-                if (position == mSelectedIndex) {
-                    text.setChecked(true);
-                }
+                text.setChecked(position == mSelectedIndex);
                 text.setEnabled(true);
                 padlock.setVisibility(View.GONE);
             }