commit 60b4af5d658a1debaa6af13a2bf1815537300c51
author Adam Lesinski <adamlesinski@google.com> Tue Mar 21 01:03:14 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 21 01:03:18 2017 +0000
tree 5f738ea64ebe6e02366b2ba0247e91d60e78c392
parent b8ce44443cdf1d9647bde1b85b9fa7a76087e6f6
parent ba9576d977c0379f5fb302c7db1b234b253919ad

Merge "AssetManager: Guard against null in array retrieval"

core/java/android/content/res/AssetManager.java

diff --git a/core/java/android/content/res/AssetManager.java b/core/java/android/content/res/AssetManager.java
index af953e6..a044804 100644
--- a/core/java/android/content/res/AssetManager.java
+++ b/core/java/android/content/res/AssetManager.java
@@ -245,9 +245,12 @@
      *
      * @param resId the resource id of the string array
      */
-    final CharSequence[] getResourceTextArray(@ArrayRes int resId) {
+    final @Nullable CharSequence[] getResourceTextArray(@ArrayRes int resId) {
         synchronized (this) {
             final int[] rawInfoArray = getArrayStringInfo(resId);
+            if (rawInfoArray == null) {
+                return null;
+            }
             final int rawInfoArrayLen = rawInfoArray.length;
             final int infoArrayLen = rawInfoArrayLen / 2;
             int block;

core/java/android/view/View.java

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 636ad45..350675f 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -5033,7 +5033,7 @@
 
                             try {
                                 rawHints = a.getTextArray(attr);
-                            } catch (NullPointerException e) {
+                            } catch (Resources.NotFoundException e) {
                                 rawString = getResources().getString(resId);
                             }
                         } else {