Merge "Fix issue #2951784: Launcher crashes on startup" into gingerbread (0a7f5fc4) · Commits · e / os / android_frameworks_base

core/java/android/view/LayoutInflater.java

+5 −4

Original line number	Diff line number	Diff line
		@@ -348,6 +348,7 @@ public abstract class LayoutInflater {
		public View inflate(XmlPullParser parser, ViewGroup root, boolean attachToRoot) {
		synchronized (mConstructorArgs) {
		final AttributeSet attrs = Xml.asAttributeSet(parser);
		Context lastContext = (Context)mConstructorArgs[0];
		mConstructorArgs[0] = mContext;
		View result = root;

		@@ -432,11 +433,11 @@ public abstract class LayoutInflater {
		+ ": " + e.getMessage());
		ex.initCause(e);
		throw ex;
		}

		// Told retain static reference on context.
		mConstructorArgs[0] = null;
		} finally {
		// Don't retain static reference on context.
		mConstructorArgs[0] = lastContext;
		mConstructorArgs[1] = null;
		}

		return result;
		}