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

Merge "Copy ContentCaptureOptions into derived Contexts" into sc-dev

Browse Source
This commit is contained in:
Ahaan Ugale
2021-07-24 01:18:17 +00:00
committed by Android (Google) Code Review
parent 75b43af58b 0cfcde8d5e
commit 2db19f5679
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/app/ContextImpl.java
View File

@@ -26,6 +26,7 @@ import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
import android.annotation.UiContext; import android.annotation.UiContext;
import android.compat.annotation.UnsupportedAppUsage; import android.compat.annotation.UnsupportedAppUsage;
import android.content.AttributionSource;
import android.content.AutofillOptions; import android.content.AutofillOptions;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.ComponentName; import android.content.ComponentName;
@@ -60,7 +61,6 @@ import android.database.sqlite.SQLiteDatabase.CursorFactory;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.net.Uri; import android.net.Uri;
import android.content.AttributionSource;
import android.os.Binder; import android.os.Binder;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
@@ -3120,6 +3120,7 @@ class ContextImpl extends Context {
mForceDisplayOverrideInResources = container.mForceDisplayOverrideInResources; mForceDisplayOverrideInResources = container.mForceDisplayOverrideInResources;
mIsConfigurationBasedContext = container.mIsConfigurationBasedContext; mIsConfigurationBasedContext = container.mIsConfigurationBasedContext;
mContextType = container.mContextType; mContextType = container.mContextType;
mContentCaptureOptions = container.mContentCaptureOptions;
} else { } else {
mBasePackageName = packageInfo.mPackageName; mBasePackageName = packageInfo.mPackageName;
ApplicationInfo ainfo = packageInfo.getApplicationInfo(); ApplicationInfo ainfo = packageInfo.getApplicationInfo();