commit c3f1898618578c1879e679860a8a90b723bc4262
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Feb 16 08:09:29 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 16 08:09:29 2018 +0000
tree 9b73306e581d8560dca3288c41626e7de2724215
parent a654f06d4085c0c689f020924844f8c513363ae2
parent 59b4babaa033fc168cec5714a56b727cc1d6c8f5

Merge "ContextWrapper should check before calling wrapped instance for autofill compat"

core/java/android/content/ContextWrapper.java

diff --git a/core/java/android/content/ContextWrapper.java b/core/java/android/content/ContextWrapper.java
index a788989..b072ee6 100644
--- a/core/java/android/content/ContextWrapper.java
+++ b/core/java/android/content/ContextWrapper.java
@@ -1000,7 +1000,7 @@
      */
     @Override
     public boolean isAutofillCompatibilityEnabled() {
-        return mBase.isAutofillCompatibilityEnabled();
+        return mBase != null && mBase.isAutofillCompatibilityEnabled();
     }
 
     /**
@@ -1008,6 +1008,8 @@
      */
     @Override
     public void setAutofillCompatibilityEnabled(boolean  autofillCompatEnabled) {
-        mBase.setAutofillCompatibilityEnabled(autofillCompatEnabled);
+        if (mBase != null) {
+            mBase.setAutofillCompatibilityEnabled(autofillCompatEnabled);
+        }
     }
 }