Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f44f4f98 authored by Adam He's avatar Adam He Committed by android-build-merger
Browse files

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

am: 2f54cf12

Change-Id: I74b50f6b2cb4d229c2f952da3848a5d0ecff88db
parents 0b8cb86f 2f54cf12

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

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