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

Commit 2389dfec authored by d34d's avatar d34d Committed by Adnan Begovic
Browse files

Account for cmsdk resources when attaching theme assets 

This keeps themes working as they did prior to the introduction
of the cmsdk resources apk.

Change-Id: Ida718b3c790813681d26df8f338f56b44b16a026
parent 871c30cb

core/java/android/app/ResourcesManager.java

+13 −7
Original line number Diff line number Diff line
@@ -67,6 +67,12 @@ public class ResourcesManager { 


    Configuration mResConfiguration;



    /**

     * Number of default assets attached to a Resource object's AssetManager

     * This currently includes framework and cmsdk resources

     */

    private static final int NUM_DEFAULT_ASSETS = 2;



    public static ResourcesManager getInstance() {

        synchronized (ResourcesManager.class) {

            if (sResourcesManager == null) {
@@ -532,10 +538,10 @@ public class ResourcesManager { 
        String basePackageName = null;

        String resourcePackageName = null;

        int count = assets.getBasePackageCount();

        if (count > 1) {

            basePackageName  = assets.getBasePackageName(1);

            resourcePackageName = assets.getBaseResourcePackageName(1);

        } else if (count == 1) {

        if (count > NUM_DEFAULT_ASSETS) {

            basePackageName  = assets.getBasePackageName(NUM_DEFAULT_ASSETS);

            resourcePackageName = assets.getBaseResourcePackageName(NUM_DEFAULT_ASSETS);

        } else if (count == NUM_DEFAULT_ASSETS) {

            basePackageName  = assets.getBasePackageName(0);

        } else {

            return false;
@@ -661,9 +667,9 @@ public class ResourcesManager { 
        // first or else the system will crash!

        String basePackageName;

        int count = assets.getBasePackageCount();

        if (count > 1) {

            basePackageName  = assets.getBasePackageName(1);

        } else if (count == 1) {

        if (count > NUM_DEFAULT_ASSETS) {

            basePackageName  = assets.getBasePackageName(NUM_DEFAULT_ASSETS);

        } else if (count == NUM_DEFAULT_ASSETS) {

            basePackageName  = assets.getBasePackageName(0);

        } else {

            return false;