summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2013-09-25 11:30:14 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-09-25 11:30:14 -0700
commitce386867484b0c4bd9b675db91c262fd73e01ffa (patch)
treee3ab5519cc4599df3c41c2be72299dacdcae5c34
parentc666d2c36be850a348673367287ae0949cce7cae (diff)
parent594ffa25b068d79eaad43a1eb1636d79d508151a (diff)
downloadpackages_apps_Settings-ce386867484b0c4bd9b675db91c262fd73e01ffa.zip
packages_apps_Settings-ce386867484b0c4bd9b675db91c262fd73e01ffa.tar.gz
packages_apps_Settings-ce386867484b0c4bd9b675db91c262fd73e01ffa.tar.bz2
am 594ffa25: am 372b6f74: Enable runtime selection for art for user builds
* commit '594ffa25b068d79eaad43a1eb1636d79d508151a': Enable runtime selection for art for user builds
-rw-r--r--src/com/android/settings/DevelopmentSettings.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index 9269b27..52706a1 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -326,9 +326,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
Preference selectRuntime = findPreference(SELECT_RUNTIME_KEY);
if (selectRuntime != null) {
mAllPrefs.add(selectRuntime);
- if (!removePreferenceForProduction(selectRuntime)) {
- filterRuntimeOptions(selectRuntime);
- }
+ filterRuntimeOptions(selectRuntime);
}
Preference hdcpChecking = findPreference(HDCP_CHECKING_KEY);