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

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

am 0a7f5fc4: Merge "Fix issue #2951784: Launcher crashes on startup" into gingerbread 

Merge commit '0a7f5fc4' into gingerbread-plus-aosp

* commit '0a7f5fc4':
  Fix issue #2951784: Launcher crashes on startup
parents 2db73305 0a7f5fc4

core/java/android/view/LayoutInflater.java

+5 −4
Original line number Original line Diff line number Diff line
@@ -348,6 +348,7 @@ public abstract class LayoutInflater { 
    public View inflate(XmlPullParser parser, ViewGroup root, boolean attachToRoot) {

    public View inflate(XmlPullParser parser, ViewGroup root, boolean attachToRoot) {

        synchronized (mConstructorArgs) {

        synchronized (mConstructorArgs) {

            final AttributeSet attrs = Xml.asAttributeSet(parser);

            final AttributeSet attrs = Xml.asAttributeSet(parser);

            Context lastContext = (Context)mConstructorArgs[0];

            mConstructorArgs[0] = mContext;

            mConstructorArgs[0] = mContext;

            View result = root;

            View result = root;
@@ -432,11 +433,11 @@ public abstract class LayoutInflater { 
                        + ": " + e.getMessage());

                        + ": " + e.getMessage());

                ex.initCause(e);

                ex.initCause(e);

                throw ex;

                throw ex;

            }

            } finally {



                // Don't retain static reference on context.

            // Told retain static reference on context.

                mConstructorArgs[0] = lastContext;

            mConstructorArgs[0] = null;

                mConstructorArgs[1] = null;

                mConstructorArgs[1] = null;

            }





            return result;

            return result;

        }

        }