commit efe9734377e96bcca2d3c16066a35a1dd05f527f
author Felipe Leme <felipeal@google.com> Mon Jan 08 09:49:15 2018 -0800
committer android-build-team Robot <android-build-team-robot@google.com> Mon Jan 08 21:27:13 2018 +0000
tree 33be2ddabdef3aa3dd85e62051e99c4a61d50c7a
parent 294224800ddf269ff026c6330b6b9e89454831ac

Ignores Resources.NotFoundException when setting ViewStructure.setTestIdEntry().

Test: manual verification using com.facebook.katana
Fixes: 71695541

Change-Id: Idefc7d3799f2ef5525a5050d63ca29a19cab730a
(cherry picked from commit 01f4f03188588d917f59d1c2737ee7bd27891dda)

core/java/android/widget/TextView.java

diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 73d53d4..dc54127 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -311,7 +311,6 @@
 public class TextView extends View implements ViewTreeObserver.OnPreDrawListener {
     static final String LOG_TAG = "TextView";
     static final boolean DEBUG_EXTRACT = false;
-    static final boolean DEBUG_AUTOFILL = false;
     private static final float[] TEMP_POSITION = new float[2];
 
     // Enum for the "typeface" XML parameter.
@@ -9516,7 +9515,7 @@
         }
         final AutofillManager afm = mContext.getSystemService(AutofillManager.class);
         if (afm != null) {
-            if (DEBUG_AUTOFILL) {
+            if (android.view.autofill.Helper.sVerbose) {
                 Log.v(LOG_TAG, "sendAfterTextChanged(): notify AFM for text=" + mText);
             }
             afm.notifyValueChanged(TextView.this);
@@ -10296,7 +10295,14 @@
         if (forAutofill) {
             structure.setDataIsSensitive(!mSetFromXmlOrResourceId);
             if (mTextId != ResourceId.ID_NULL) {
-                structure.setTextIdEntry(getResources().getResourceEntryName(mTextId));
+                try {
+                    structure.setTextIdEntry(getResources().getResourceEntryName(mTextId));
+                } catch (Resources.NotFoundException e) {
+                    if (android.view.autofill.Helper.sVerbose) {
+                        Log.v(LOG_TAG, "onProvideAutofillStructure(): cannot set name for text id "
+                                + mTextId + ": " + e.getMessage());
+                    }
+                }
             }
         }