summaryrefslogtreecommitdiffstats
path: root/core/java/android/preference/PreferenceActivity.java
diff options
context:
space:
mode:
authorChet Haase <chet@google.com>2013-09-05 17:07:30 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-09-05 17:07:30 +0000
commita9fa33b366e82f330ec8a68b616896876e7ddc46 (patch)
tree4984d5112645dc0967aa687043869e35a3bc3608 /core/java/android/preference/PreferenceActivity.java
parent217ecacd18407ed6be2dd9a7f062f84103eddb32 (diff)
parente8222dddaf2e3da14380101e818d4254899e0c0d (diff)
downloadframeworks_base-a9fa33b366e82f330ec8a68b616896876e7ddc46.zip
frameworks_base-a9fa33b366e82f330ec8a68b616896876e7ddc46.tar.gz
frameworks_base-a9fa33b366e82f330ec8a68b616896876e7ddc46.tar.bz2
Merge "Change build version from KEY_LIME_PIE to KITKAT" into klp-dev
Diffstat (limited to 'core/java/android/preference/PreferenceActivity.java')
-rw-r--r--core/java/android/preference/PreferenceActivity.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/preference/PreferenceActivity.java b/core/java/android/preference/PreferenceActivity.java
index 0f765fa..5d886a3 100644
--- a/core/java/android/preference/PreferenceActivity.java
+++ b/core/java/android/preference/PreferenceActivity.java
@@ -893,7 +893,7 @@ public abstract class PreferenceActivity extends ListActivity implements
* @return true if the fragment class name is valid for this Activity and false otherwise.
*/
protected boolean isValidFragment(String fragmentName) {
- if (getApplicationInfo().targetSdkVersion >= android.os.Build.VERSION_CODES.KEY_LIME_PIE) {
+ if (getApplicationInfo().targetSdkVersion >= android.os.Build.VERSION_CODES.KITKAT) {
Log.w(TAG, "Subclasses of PreferenceActivity must override isValidFragment(String)"
+ " to verify that the Fragment class is valid! " + this.getClass().getName()
+ " has not checked if fragment " + fragmentName + " is valid.");