| commit | dc0ee77d978539952434e1e27c727674a296ede3 | [log] [tgz] |
|---|---|---|
| author | Linux Build Service Account <lnxbuild@localhost> | Sun Dec 18 06:42:12 2016 -0700 |
| committer | Linux Build Service Account <lnxbuild@localhost> | Sun Dec 18 06:42:12 2016 -0700 |
| tree | 1e5b14e6af2accdaaa497ce2726fe9bce47b9869 | |
| parent | f22df87b2f992733059195d71a8fef2369f5368b [diff] | |
| parent | 30a9f5d5fa384087aaf22038698d080a3a90da41 [diff] |
Promotion of fm.lnx.2.1-00017. CRs Change ID Subject -------------------------------------------------------------------------------------------------------------- 1095523 I74e1c6be3381c05c66ab697d82401da8e27badec Check if string is null before adding to treeset Change-Id: I40e5f77bdbd5b4e7adc8d3a4dd54a7b6042db9ec CRs-Fixed: 1095523
diff --git a/fmapp2/src/com/caf/fmradio/FmSharedPreferences.java b/fmapp2/src/com/caf/fmradio/FmSharedPreferences.java index 2e2aa70..70a7d1c 100644 --- a/fmapp2/src/com/caf/fmradio/FmSharedPreferences.java +++ b/fmapp2/src/com/caf/fmradio/FmSharedPreferences.java
@@ -342,7 +342,8 @@ } } public static void addTags(int index, String s) { - if ((index >= 0) && (index <FmSharedPreferences.MAX_NUM_TAG_TYPES)) { + if ((index >= 0) && (index <FmSharedPreferences.MAX_NUM_TAG_TYPES) && + s != null && !s.isEmpty()) { if(tagList[index] == null) { tagList[index] = new TreeSet<String>(); }