Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 2f54cf120e

Change-Id: Idbb78b3f2455346d08370f189ad0289745f28a51
This commit is contained in:
Adam He
2019-06-25 15:17:19 -07:00
committed by android-build-merger
parent 003eb76b4c 2f54cf120e
commit 209c597aba
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/com/android/internal/policy/DecorContext.java
View File

@@ -16,6 +16,7 @@
package com.android.internal.policy; package com.android.internal.policy;
import android.content.AutofillOptions;
import android.content.ContentCaptureOptions; import android.content.ContentCaptureOptions;
import android.content.Context; import android.content.Context;
import android.content.res.AssetManager; import android.content.res.AssetManager;
@@ -97,6 +98,15 @@ public class DecorContext extends ContextThemeWrapper {
return mActivityResources.getAssets(); return mActivityResources.getAssets();
} }
@Override
public AutofillOptions getAutofillOptions() {
Context activityContext = mActivityContext.get();
if (activityContext != null) {
return activityContext.getAutofillOptions();
}
return null;
}
@Override @Override
public ContentCaptureOptions getContentCaptureOptions() { public ContentCaptureOptions getContentCaptureOptions() {
Context activityContext = mActivityContext.get(); Context activityContext = mActivityContext.get();