commit 2cbcc987eef242f9ea5e6c084e6cfee4cbd8782f
author Tadashi G. Takaoka <takaoka@google.com> Fri Nov 15 09:03:50 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Nov 15 09:03:51 2013 +0000
tree 8a8c3f2d281c518b93c40cb2702040423967b0a2
parent be734d298aeb716af6fc3848cb955ec0660b40b6
parent ffb064656ed0a44d6f9fef66e0c26f77c8611907

Merge "Fix unusual NPE after onDestroy"

java/src/com/android/inputmethod/keyboard/internal/KeyStylesSet.java

diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyStylesSet.java b/java/src/com/android/inputmethod/keyboard/internal/KeyStylesSet.java
index 05d855e..f7e43a6 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/KeyStylesSet.java
+++ b/java/src/com/android/inputmethod/keyboard/internal/KeyStylesSet.java
@@ -27,6 +27,7 @@
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
+import java.util.Arrays;
 import java.util.HashMap;
 
 public final class KeyStylesSet {
@@ -90,7 +91,8 @@
             }
             final Object value = mStyleAttributes.get(index);
             if (value != null) {
-                return (String[])value;
+                final String[] array = (String[])value;
+                return Arrays.copyOf(array, array.length);
             }
             final KeyStyle parentStyle = mStyles.get(mParentStyleName);
             return parentStyle.getStringArray(a, index);