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

Commit fa5f30a0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Marks Context.createPackageContextAsUser as System"

parents a938cfa7 ef4c4071

api/current.txt

+9 −9
Original line number Diff line number Diff line
@@ -11616,15 +11616,15 @@ package android.content.res { 














  public final class AssetManager implements java.lang.AutoCloseable {















    method public void close();













    method public final java.lang.String[] getLocales();













    method public final java.lang.String[] list(java.lang.String) throws java.io.IOException;













    method public final java.io.InputStream open(java.lang.String) throws java.io.IOException;













    method public final java.io.InputStream open(java.lang.String, int) throws java.io.IOException;













    method public final android.content.res.AssetFileDescriptor openFd(java.lang.String) throws java.io.IOException;













    method public final android.content.res.AssetFileDescriptor openNonAssetFd(java.lang.String) throws java.io.IOException;













    method public final android.content.res.AssetFileDescriptor openNonAssetFd(int, java.lang.String) throws java.io.IOException;













    method public final android.content.res.XmlResourceParser openXmlResourceParser(java.lang.String) throws java.io.IOException;













    method public final android.content.res.XmlResourceParser openXmlResourceParser(int, java.lang.String) throws java.io.IOException;













    method public java.lang.String[] getLocales();













    method public java.lang.String[] list(java.lang.String) throws java.io.IOException;













    method public java.io.InputStream open(java.lang.String) throws java.io.IOException;













    method public java.io.InputStream open(java.lang.String, int) throws java.io.IOException;













    method public android.content.res.AssetFileDescriptor openFd(java.lang.String) throws java.io.IOException;













    method public android.content.res.AssetFileDescriptor openNonAssetFd(java.lang.String) throws java.io.IOException;













    method public android.content.res.AssetFileDescriptor openNonAssetFd(int, java.lang.String) throws java.io.IOException;













    method public android.content.res.XmlResourceParser openXmlResourceParser(java.lang.String) throws java.io.IOException;













    method public android.content.res.XmlResourceParser openXmlResourceParser(int, java.lang.String) throws java.io.IOException;















    field public static final int ACCESS_BUFFER = 3; // 0x3















    field public static final int ACCESS_RANDOM = 1; // 0x1















    field public static final int ACCESS_STREAMING = 2; // 0x2

























api/system-current.txt



+1
−0




























Original line number
Diff line number
Diff line








@@ -774,6 +774,7 @@ package android.content {













  public abstract class Context {















    method public boolean bindServiceAsUser(android.content.Intent, android.content.ServiceConnection, int, android.os.UserHandle);















    method public abstract android.content.Context createCredentialProtectedStorageContext();













    method public android.content.Context createPackageContextAsUser(java.lang.String, int, android.os.UserHandle) throws android.content.pm.PackageManager.NameNotFoundException;















    method public abstract java.io.File getPreloadsFileCache();















    method public abstract boolean isCredentialProtectedStorage();















    method public abstract void sendBroadcast(android.content.Intent, java.lang.String, android.os.Bundle);

































core/java/android/content/Context.java



+9
−2




























Original line number
Diff line number
Diff line








@@ -49,6 +49,7 @@ import android.database.sqlite.SQLiteDatabase.CursorFactory;













import android.graphics.Bitmap;















import android.graphics.drawable.Drawable;















import android.net.Uri;













import android.os.Build;















import android.os.Bundle;















import android.os.Environment;















import android.os.Handler;










@@ -4678,9 +4679,15 @@ public abstract class Context {













     *















     * @hide















     */













    public abstract Context createPackageContextAsUser(













    @SystemApi













    public Context createPackageContextAsUser(















            String packageName, @CreatePackageOptions int flags, UserHandle user)













            throws PackageManager.NameNotFoundException;













            throws PackageManager.NameNotFoundException {













        if (Build.IS_ENG) {













            throw new IllegalStateException("createPackageContextAsUser not overridden!");













        }













        return this;













    }































    /**















     * Creates a context given an {@link android.content.pm.ApplicationInfo}.