Merge "Fixed autofill compat mode regression caused by DecorContext" into qt-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
2f54cf120e
@@ -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();
|
||||
|
||||
Reference in New Issue
Block a user