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

Commit 6b905bca authored Oct 15, 2019 by TreeHugger Robot Committed by Android (Google) Code Review Oct 15, 2019

Merge "Explicitly take flags in createContextAsUser()"

parents 7b8bf4a8 e5449f0b

api/system-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -1359,7 +1359,7 @@ package android.content {

		public abstract class Context {
		method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public boolean bindServiceAsUser(@RequiresPermission android.content.Intent, android.content.ServiceConnection, int, android.os.UserHandle);
		method @NonNull public android.content.Context createContextAsUser(@NonNull android.os.UserHandle);
		method @NonNull public android.content.Context createContextAsUser(@NonNull android.os.UserHandle, int);
		method public abstract android.content.Context createCredentialProtectedStorageContext();
		method @NonNull public android.content.Context createPackageContextAsUser(@NonNull String, int, @NonNull android.os.UserHandle) throws android.content.pm.PackageManager.NameNotFoundException;
		method @Nullable public abstract java.io.File getPreloadsFileCache();

api/test-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -659,7 +659,7 @@ package android.content {
		}

		public abstract class Context {
		method @NonNull public android.content.Context createContextAsUser(@NonNull android.os.UserHandle);
		method @NonNull public android.content.Context createContextAsUser(@NonNull android.os.UserHandle, int);
		method @NonNull public android.content.Context createPackageContextAsUser(@NonNull String, int, @NonNull android.os.UserHandle) throws android.content.pm.PackageManager.NameNotFoundException;
		method public abstract android.view.Display getDisplay();
		method public abstract int getDisplayId();

core/java/android/app/ContextImpl.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -2212,9 +2212,9 @@ class ContextImpl extends Context {
		}

		@Override
		public Context createContextAsUser(UserHandle user) {
		public Context createContextAsUser(UserHandle user, @CreatePackageOptions int flags) {
		try {
		return createPackageContextAsUser(getPackageName(), mFlags, user);
		return createPackageContextAsUser(getPackageName(), flags, user);
		} catch (NameNotFoundException e) {
		throw new IllegalStateException("Own package not found: package=" + getPackageName());
		}

core/java/android/content/Context.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -5244,7 +5244,7 @@ public abstract class Context {
		@SystemApi
		@TestApi
		@NonNull
		public Context createContextAsUser(@NonNull UserHandle user) {
		public Context createContextAsUser(@NonNull UserHandle user, @CreatePackageOptions int flags) {
		if (Build.IS_ENG) {
		throw new IllegalStateException("createContextAsUser not overridden!");
		}

core/java/android/content/ContextWrapper.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -885,8 +885,8 @@ public class ContextWrapper extends Context {

		/** @hide */
		@Override
		public Context createContextAsUser(UserHandle user) {
		return mBase.createContextAsUser(user);
		public Context createContextAsUser(UserHandle user, @CreatePackageOptions int flags) {
		return mBase.createContextAsUser(user, flags);
		}

		/** @hide */