Merge "Fixed autofill compat mode regression caused by DecorContext" into qt-dev

This commit is contained in:
TreeHugger Robot
2019-06-25 21:32:01 +00:00
committed by Android (Google) Code Review

View File

@@ -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();