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

Commit d93df9ca authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am b37abe38: am d3cc4967: Merge "Fix issue #2549955: Moving the application... 

am b37abe38: am d3cc4967: Merge "Fix issue #2549955: Moving the application fails -Activity Manager Crash on launching the app" into froyo

Merge commit 'b37abe38' into kraken

* commit 'b37abe38':
  Fix issue #2549955: Moving the application fails -Activity Manager Crash on launching the app
parents 90dd6462 b37abe38

core/java/android/app/ContextImpl.java

+3 −2
Original line number Diff line number Diff line
@@ -1482,7 +1482,8 @@ class ContextImpl extends Context { 
        mPackageInfo = packageInfo;

        mResources = mPackageInfo.getResources(mainThread);



        if (container != null && container.getCompatibilityInfo().applicationScale !=

        if (mResources != null && container != null

                && container.getCompatibilityInfo().applicationScale !=

                        mResources.getCompatibilityInfo().applicationScale) {

            if (DEBUG) {

                Log.d(TAG, "loaded context has different scaling. Using container's" +