Merge "Fixed autofill compat mode regression caused by DecorContext" into qt-dev (2f54cf12) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/policy/DecorContext.java

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -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();