From 303a2ae5c90300caaf87571e28cb4ffdcd816ce3 Mon Sep 17 00:00:00 2001 From: Dan Zivkovic Date: Tue, 13 Jan 2015 11:32:08 -0800 Subject: [PATCH] Fix NPE in PunctuationSuggestions. The NPE happens when the keyboard doesn't specify any punctuation suggestions. Bug 18047927. Change-Id: I9f8aa35df4f163b527dc6580a99afc6da45a96b8 --- .../latin/PunctuationSuggestions.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/java/src/com/android/inputmethod/latin/PunctuationSuggestions.java b/java/src/com/android/inputmethod/latin/PunctuationSuggestions.java index 555bbc7d4..c9b6d6b70 100644 --- a/java/src/com/android/inputmethod/latin/PunctuationSuggestions.java +++ b/java/src/com/android/inputmethod/latin/PunctuationSuggestions.java @@ -23,6 +23,8 @@ import com.android.inputmethod.latin.common.StringUtils; import java.util.ArrayList; import java.util.Arrays; +import javax.annotation.Nullable; + /** * The extended {@link SuggestedWords} class to represent punctuation suggestions. * @@ -49,12 +51,16 @@ public final class PunctuationSuggestions extends SuggestedWords { * @return The {@link PunctuationSuggestions} object. */ public static PunctuationSuggestions newPunctuationSuggestions( - final String[] punctuationSpecs) { - final ArrayList puncuationsList = new ArrayList<>(); - for (final String puncSpec : punctuationSpecs) { - puncuationsList.add(newHardCodedWordInfo(puncSpec)); + @Nullable final String[] punctuationSpecs) { + if (punctuationSpecs == null || punctuationSpecs.length == 0) { + return new PunctuationSuggestions(new ArrayList(0)); } - return new PunctuationSuggestions(puncuationsList); + final ArrayList punctuationList = + new ArrayList<>(punctuationSpecs.length); + for (String spec : punctuationSpecs) { + punctuationList.add(newHardCodedWordInfo(spec)); + } + return new PunctuationSuggestions(punctuationList); } /**