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

Commit a26a029a authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/28680942',... 

Merge cherrypicks of ['googleplex-android-review.googlesource.com/28680942', 'googleplex-android-review.googlesource.com/28824345'] into 24Q3-release.

Change-Id: I5246b15d4763ead1048c254ba66265b046b22344
parents 6881fb10 6f304be5

core/java/android/app/ResourcesManager.java

+3 −2
Original line number Diff line number Diff line
@@ -1833,9 +1833,10 @@ public class ResourcesManager { 
                    // have shared library asset paths appended if there are any.

                    if (r.getImpl() != null) {

                        final ResourcesImpl oldImpl = r.getImpl();

                        final AssetManager oldAssets = oldImpl.getAssets();

                        // ResourcesImpl constructor will help to append shared library asset paths.

                        if (oldImpl.getAssets().isUpToDate()) {

                            final ResourcesImpl newImpl = new ResourcesImpl(oldImpl.getAssets(),

                        if (oldAssets != AssetManager.getSystem() && oldAssets.isUpToDate()) {

                            final ResourcesImpl newImpl = new ResourcesImpl(oldAssets,

                                    oldImpl.getMetrics(), oldImpl.getConfiguration(),

                                    oldImpl.getDisplayAdjustments());

                            r.setImpl(newImpl);

core/java/com/android/internal/policy/PhoneWindow.java

+1 −0
Original line number Diff line number Diff line
@@ -418,6 +418,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { 
            mElevation = preservedWindow.getElevation();

            mLoadElevation = false;

            mForceDecorInstall = true;

            mDecorFitsSystemWindows = preservedWindow.decorFitsSystemWindows();

            setSystemBarAppearance(preservedWindow.getSystemBarAppearance());

            // If we're preserving window, carry over the app token from the preserved

            // window, as we'll be skipping the addView in handleResumeActivity(), and