diff options
| author | Paul Hobbs <phobbs@google.com> | 2021-06-29 19:54:32 +0000 |
|---|---|---|
| committer | Paul Hobbs <phobbs@google.com> | 2021-06-29 20:06:45 +0000 |
| commit | cb5a80ea57b51fcde117dea253c546dbba9f27f1 (patch) | |
| tree | d4a59b5ac880a4f7e9d5c61dc742a621cf850a26 /core/java/android/app/ContextImpl.java | |
| parent | 214bf65c95684662cf35284b381b8595baefaee1 (diff) | |
Revert^2 "Deprecate Context#createApplicationContext"
Bug: 192242649
5a41b45a85286200f029b6ac06d004cb32c88dd0
Change-Id: Idcebd68e0079e7e87de04ae25069b3a9ff72093c
Diffstat (limited to 'core/java/android/app/ContextImpl.java')
| -rw-r--r-- | core/java/android/app/ContextImpl.java | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java index 5e99c79a7497..16b6ea5bcf42 100644 --- a/core/java/android/app/ContextImpl.java +++ b/core/java/android/app/ContextImpl.java @@ -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; @@ -47,6 +48,7 @@ import android.content.pm.ActivityInfo; import android.content.pm.ApplicationInfo; import android.content.pm.IPackageManager; import android.content.pm.PackageManager; +import android.content.pm.PackageManager.ApplicationInfoFlags; import android.content.pm.PackageManager.NameNotFoundException; import android.content.res.AssetManager; import android.content.res.CompatResources; @@ -60,7 +62,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; @@ -2493,6 +2494,13 @@ class ContextImpl extends Context { @Override public Context createPackageContextAsUser(String packageName, int flags, UserHandle user) throws NameNotFoundException { + return createPackageContextAsUser(packageName, flags, user, 0 /* packageFlags */); + } + + @Override + public Context createPackageContextAsUser( + @NonNull String packageName, @CreatePackageOptions int flags, @NonNull UserHandle user, + @ApplicationInfoFlags int packageFlags) throws PackageManager.NameNotFoundException { if (packageName.equals("system") || packageName.equals("android")) { // The system resources are loaded in every application, so we can safely copy // the context without reloading Resources. @@ -2503,7 +2511,7 @@ class ContextImpl extends Context { } LoadedApk pi = mMainThread.getPackageInfo(packageName, mResources.getCompatibilityInfo(), - flags | CONTEXT_REGISTER_PACKAGE, user.getIdentifier()); + flags | CONTEXT_REGISTER_PACKAGE, user.getIdentifier(), packageFlags); if (pi != null) { ContextImpl c = new ContextImpl(this, mMainThread, pi, mParams, mAttributionSource.getAttributionTag(), |