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

Commit c18c0d33 authored by Ahaan Ugale's avatar Ahaan Ugale Committed by Automerger Merge Worker
Browse files

Merge "Copy ContentCaptureOptions into derived Contexts" into sc-dev am: 2db19f56 am: a817b3ca 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15352571

Change-Id: I824d9ea20315a5373bb6fae25d1add310c3ed006
parents 57d785db a817b3ca

core/java/android/app/ContextImpl.java

+2 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.annotation.NonNull; 
import android.annotation.Nullable;

import android.annotation.UiContext;

import android.compat.annotation.UnsupportedAppUsage;

import android.content.AttributionSource;

import android.content.AutofillOptions;

import android.content.BroadcastReceiver;

import android.content.ComponentName;
@@ -60,7 +61,6 @@ import android.database.sqlite.SQLiteDatabase.CursorFactory; 
import android.graphics.Bitmap;

import android.graphics.drawable.Drawable;

import android.net.Uri;

import android.content.AttributionSource;

import android.os.Binder;

import android.os.Build;

import android.os.Bundle;
@@ -3123,6 +3123,7 @@ class ContextImpl extends Context { 
            mForceDisplayOverrideInResources = container.mForceDisplayOverrideInResources;

            mIsConfigurationBasedContext = container.mIsConfigurationBasedContext;

            mContextType = container.mContextType;

            mContentCaptureOptions = container.mContentCaptureOptions;

        } else {

            mBasePackageName = packageInfo.mPackageName;

            ApplicationInfo ainfo = packageInfo.getApplicationInfo();