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

Commit 1e80cd76 authored by Ryan Mitchell's avatar Ryan Mitchell Committed by Android (Google) Code Review
Browse files

Merge changes from topic "res-loader" 

* changes:
  Refactor ResourcesLoader Tests
  Refactor ResourcesLoader APIs
parents b37b54cc 6115858c

apct-tests/perftests/core/src/android/app/ResourcesManagerPerfTest.java

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ public class ResourcesManagerPerfTest { 
    private void getResourcesForPath(String path) {

        ResourcesManager.getInstance().getResources(null, path, null, null, null,

                Display.DEFAULT_DISPLAY, null, sContext.getResources().getCompatibilityInfo(),

                null);

                null, null);

    }



    @Test

apct-tests/perftests/core/src/android/app/ResourcesThemePerfTest.java

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ public class ResourcesThemePerfTest { 


        Resources destResources = resourcesManager.getResources(null, ai.sourceDir,

                ai.splitSourceDirs, ai.resourceDirs, ai.sharedLibraryFiles, Display.DEFAULT_DISPLAY,

                c, mContext.getResources().getCompatibilityInfo(), null);

                c, mContext.getResources().getCompatibilityInfo(), null, null);

        Assert.assertNotEquals(destResources.getAssets(), mContext.getAssets());



        Resources.Theme destTheme = destResources.newTheme();

api/current.txt

+26 −16
Original line number Diff line number Diff line
@@ -12653,8 +12653,8 @@ package android.content.res { 














  public class Resources {















    ctor @Deprecated public Resources(android.content.res.AssetManager, android.util.DisplayMetrics, android.content.res.Configuration);













    method public void addLoader(@NonNull android.content.res.loader.ResourceLoader, @NonNull android.content.res.loader.ResourcesProvider, @IntRange(from=0) int);













    method public int addLoader(@NonNull android.content.res.loader.ResourceLoader, @NonNull android.content.res.loader.ResourcesProvider);













    method public void addLoader(@NonNull android.content.res.loader.ResourcesLoader);













    method public void clearLoaders();















    method public final void finishPreloading();















    method public final void flushLayoutCache();















    method @NonNull public android.content.res.XmlResourceParser getAnimation(@AnimRes @AnimatorRes int) throws android.content.res.Resources.NotFoundException;









@@ -12681,7 +12681,7 @@ package android.content.res {













    method @NonNull public int[] getIntArray(@ArrayRes int) throws android.content.res.Resources.NotFoundException;















    method public int getInteger(@IntegerRes int) throws android.content.res.Resources.NotFoundException;















    method @NonNull public android.content.res.XmlResourceParser getLayout(@LayoutRes int) throws android.content.res.Resources.NotFoundException;













    method @NonNull public java.util.List<android.util.Pair<android.content.res.loader.ResourceLoader,android.content.res.loader.ResourcesProvider>> getLoaders();













    method @NonNull public java.util.List<android.content.res.loader.ResourcesLoader> getLoaders();















    method @Deprecated public android.graphics.Movie getMovie(@RawRes int) throws android.content.res.Resources.NotFoundException;















    method @NonNull public String getQuantityString(@PluralsRes int, int, java.lang.Object...) throws android.content.res.Resources.NotFoundException;















    method @NonNull public String getQuantityString(@PluralsRes int, int) throws android.content.res.Resources.NotFoundException;










@@ -12709,8 +12709,8 @@ package android.content.res {













    method public android.content.res.AssetFileDescriptor openRawResourceFd(@RawRes int) throws android.content.res.Resources.NotFoundException;















    method public void parseBundleExtra(String, android.util.AttributeSet, android.os.Bundle) throws org.xmlpull.v1.XmlPullParserException;















    method public void parseBundleExtras(android.content.res.XmlResourceParser, android.os.Bundle) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;













    method public int removeLoader(@NonNull android.content.res.loader.ResourceLoader);













    method public void setLoaders(@Nullable java.util.List<android.util.Pair<android.content.res.loader.ResourceLoader,android.content.res.loader.ResourcesProvider>>);













    method public void removeLoader(@NonNull android.content.res.loader.ResourcesLoader);













    method public void setLoaders(@NonNull java.util.List<android.content.res.loader.ResourcesLoader>);















    method @Deprecated public void updateConfiguration(android.content.res.Configuration, android.util.DisplayMetrics);















    field @AnyRes public static final int ID_NULL = 0; // 0x0















  }










@@ -12780,27 +12780,37 @@ package android.content.res {



























package android.content.res.loader {



























  public class DirectoryResourceLoader implements android.content.res.loader.ResourceLoader {













    ctor public DirectoryResourceLoader(@NonNull java.io.File);













  public interface AssetsProvider {













    method @Nullable public default java.io.InputStream loadAsset(@NonNull String, int) throws java.io.IOException;













    method @Nullable public default android.os.ParcelFileDescriptor loadAssetParcelFd(@NonNull String) throws java.io.IOException;













  }

























  public class DirectoryAssetsProvider implements android.content.res.loader.AssetsProvider {













    ctor public DirectoryAssetsProvider(@NonNull java.io.File);















    method @Nullable public java.io.File findFile(@NonNull String);















    method @NonNull public java.io.File getDirectory();















  }



























  public interface ResourceLoader {













    method @Nullable public default java.io.InputStream loadAsset(@NonNull String, int) throws java.io.IOException;













    method @Nullable public default android.os.ParcelFileDescriptor loadAssetFd(@NonNull String) throws java.io.IOException;













    method @Nullable public default android.graphics.drawable.Drawable loadDrawable(@NonNull android.util.TypedValue, int, int, @Nullable android.content.res.Resources.Theme);













    method @Nullable public default android.content.res.XmlResourceParser loadXmlResourceParser(@NonNull String, @AnyRes int);













  public class ResourcesLoader {













    ctor public ResourcesLoader();













    method public void addProvider(@NonNull android.content.res.loader.ResourcesProvider);













    method public void clearProviders();













    method @NonNull public java.util.List<android.content.res.loader.ResourcesProvider> getProviders();













    method public void removeProvider(@NonNull android.content.res.loader.ResourcesProvider);













    method public void setProviders(@NonNull java.util.List<android.content.res.loader.ResourcesProvider>);















  }



























  public final class ResourcesProvider implements java.lang.AutoCloseable java.io.Closeable {













  public class ResourcesProvider implements java.lang.AutoCloseable java.io.Closeable {















    method public void close();













    method @NonNull public static android.content.res.loader.ResourcesProvider empty();













    method @NonNull public static android.content.res.loader.ResourcesProvider empty(@NonNull android.content.res.loader.AssetsProvider);













    method @Nullable public android.content.res.loader.AssetsProvider getAssetsProvider();















    method @NonNull public static android.content.res.loader.ResourcesProvider loadFromApk(@NonNull android.os.ParcelFileDescriptor) throws java.io.IOException;













    method @NonNull public static android.content.res.loader.ResourcesProvider loadFromApk(@NonNull android.os.ParcelFileDescriptor, @Nullable android.content.res.loader.AssetsProvider) throws java.io.IOException;















    method @NonNull public static android.content.res.loader.ResourcesProvider loadFromApk(@NonNull android.os.SharedMemory) throws java.io.IOException;













    method @NonNull public static android.content.res.loader.ResourcesProvider loadFromArsc(@NonNull android.os.ParcelFileDescriptor) throws java.io.IOException;













    method @NonNull public static android.content.res.loader.ResourcesProvider loadFromArsc(@NonNull android.os.SharedMemory) throws java.io.IOException;













    method @NonNull public static android.content.res.loader.ResourcesProvider loadFromApk(@NonNull android.os.SharedMemory, @Nullable android.content.res.loader.AssetsProvider) throws java.io.IOException;















    method @NonNull public static android.content.res.loader.ResourcesProvider loadFromSplit(@NonNull android.content.Context, @NonNull String) throws java.io.IOException;













    method @NonNull public static android.content.res.loader.ResourcesProvider loadFromTable(@NonNull android.os.ParcelFileDescriptor, @Nullable android.content.res.loader.AssetsProvider) throws java.io.IOException;













    method @NonNull public static android.content.res.loader.ResourcesProvider loadFromTable(@NonNull android.os.SharedMemory, @Nullable android.content.res.loader.AssetsProvider) throws java.io.IOException;















  }





























}

























core/java/android/app/ActivityThread.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -2198,7 +2198,7 @@ public final class ActivityThread extends ClientTransactionHandler {













    Resources getTopLevelResources(String resDir, String[] splitResDirs, String[] overlayDirs,















            String[] libDirs, int displayId, LoadedApk pkgInfo) {















        return mResourcesManager.getResources(null, resDir, splitResDirs, overlayDirs, libDirs,













                displayId, null, pkgInfo.getCompatibilityInfo(), pkgInfo.getClassLoader());













                displayId, null, pkgInfo.getCompatibilityInfo(), pkgInfo.getClassLoader(), null);















    }































    @UnsupportedAppUsage

































core/java/android/app/ContextImpl.java



+19
−9




























Original line number
Diff line number
Diff line








@@ -46,6 +46,7 @@ import android.content.res.CompatResources;













import android.content.res.CompatibilityInfo;















import android.content.res.Configuration;















import android.content.res.Resources;













import android.content.res.loader.ResourcesLoader;















import android.database.DatabaseErrorHandler;















import android.database.sqlite.SQLiteDatabase;















import android.database.sqlite.SQLiteDatabase.CursorFactory;










@@ -100,6 +101,7 @@ import java.lang.annotation.RetentionPolicy;













import java.nio.ByteOrder;















import java.nio.file.Path;















import java.util.ArrayList;













import java.util.List;















import java.util.Objects;















import java.util.concurrent.Executor;


























@@ -2217,7 +2219,8 @@ class ContextImpl extends Context {













    }































    private static Resources createResources(IBinder activityToken, LoadedApk pi, String splitName,













            int displayId, Configuration overrideConfig, CompatibilityInfo compatInfo) {













            int displayId, Configuration overrideConfig, CompatibilityInfo compatInfo,













            List<ResourcesLoader> resourcesLoader) {















        final String[] splitResDirs;















        final ClassLoader classLoader;















        try {









@@ -2234,7 +2237,8 @@ class ContextImpl extends Context {













                displayId,















                overrideConfig,















                compatInfo,













                classLoader);













                classLoader,













                resourcesLoader);















    }































    @Override









@@ -2249,7 +2253,7 @@ class ContextImpl extends Context {













            final int displayId = getDisplayId();































            c.setResources(createResources(mToken, pi, null, displayId, null,













                    getDisplayAdjustments(displayId).getCompatibilityInfo()));













                    getDisplayAdjustments(displayId).getCompatibilityInfo(), null));















            if (c.mResources != null) {















                return c;















            }










@@ -2284,7 +2288,7 @@ class ContextImpl extends Context {













            final int displayId = getDisplayId();































            c.setResources(createResources(mToken, pi, null, displayId, null,













                    getDisplayAdjustments(displayId).getCompatibilityInfo()));













                    getDisplayAdjustments(displayId).getCompatibilityInfo(), null));















            if (c.mResources != null) {















                return c;















            }










@@ -2328,7 +2332,8 @@ class ContextImpl extends Context {













                displayId,















                null,















                mPackageInfo.getCompatibilityInfo(),













                classLoader));













                classLoader,













                mResources.getLoaders()));















        return context;















    }

























@@ -2342,8 +2347,10 @@ class ContextImpl extends Context {













                mSplitName, mToken, mUser, mFlags, mClassLoader, null);































        final int displayId = getDisplayId();





























        context.setResources(createResources(mToken, mPackageInfo, mSplitName, displayId,













                overrideConfiguration, getDisplayAdjustments(displayId).getCompatibilityInfo()));













                overrideConfiguration, getDisplayAdjustments(displayId).getCompatibilityInfo(),













                mResources.getLoaders()));















        return context;















    }

























@@ -2357,8 +2364,10 @@ class ContextImpl extends Context {













                mSplitName, mToken, mUser, mFlags, mClassLoader, null);































        final int displayId = display.getDisplayId();





























        context.setResources(createResources(mToken, mPackageInfo, mSplitName, displayId,













                null, getDisplayAdjustments(displayId).getCompatibilityInfo()));













                null, getDisplayAdjustments(displayId).getCompatibilityInfo(),













                mResources.getLoaders()));















        context.mDisplay = display;















        return context;















    }










@@ -2564,7 +2573,7 @@ class ContextImpl extends Context {













        ContextImpl context = new ContextImpl(null, systemContext.mMainThread, packageInfo, null,















                null, null, null, 0, null, null);















        context.setResources(createResources(null, packageInfo, null, displayId, null,













                packageInfo.getCompatibilityInfo()));













                packageInfo.getCompatibilityInfo(), null));















        context.updateDisplay(displayId);















        context.mIsSystemOrSystemUiContext = true;















        return context;










@@ -2637,7 +2646,8 @@ class ContextImpl extends Context {













                displayId,















                overrideConfiguration,















                compatInfo,













                classLoader));













                classLoader,













                packageInfo.getApplication().getResources().getLoaders()));















        context.mDisplay = resourcesManager.getAdjustedDisplay(displayId,















                context.getResources());















        return context;