From 14c5b940589f14765cde6bf2926ff61a39b73956 Mon Sep 17 00:00:00 2001
From: Adam He <adamhe@google.com>
Date: Tue, 25 Jun 2019 11:40:57 -0700
Subject: [PATCH] Fixed autofill compat mode regression caused by DecorContext

Fixes: 135038324
Test: manual verification
Test: atest CtsAutoFillServiceTestCases
Change-Id: Iab32c24fdd9ad02308e79652422d1c4965be8e7c
---
 .../java/com/android/internal/policy/DecorContext.java | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/core/java/com/android/internal/policy/DecorContext.java b/core/java/com/android/internal/policy/DecorContext.java
index 56a40a3698ccd..da1b72f05a983 100644
--- a/core/java/com/android/internal/policy/DecorContext.java
+++ b/core/java/com/android/internal/policy/DecorContext.java
@@ -16,6 +16,7 @@
 
 package com.android.internal.policy;
 
+import android.content.AutofillOptions;
 import android.content.ContentCaptureOptions;
 import android.content.Context;
 import android.content.res.AssetManager;
@@ -97,6 +98,15 @@ public class DecorContext extends ContextThemeWrapper {
         return mActivityResources.getAssets();
     }
 
+    @Override
+    public AutofillOptions getAutofillOptions() {
+        Context activityContext = mActivityContext.get();
+        if (activityContext != null) {
+            return activityContext.getAutofillOptions();
+        }
+        return null;
+    }
+
     @Override
     public ContentCaptureOptions getContentCaptureOptions() {
         Context activityContext = mActivityContext.get();