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

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

am d3cc4967: Merge "Fix issue #2549955: Moving the application fails -Activity... 

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

Merge commit 'd3cc4967' into froyo-plus-aosp

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

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" +