Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge commit '0a7f5fc474182c58b478d8f9017209dcf8d0ca0b' into gingerbread-plus-aosp

* commit '0a7f5fc474182c58b478d8f9017209dcf8d0ca0b':
  Fix issue #2951784: Launcher crashes on startup
This commit is contained in:
Dianne Hackborn
2010-08-26 10:50:11 -07:00
committed by Android Git Automerger
parent 2db7330578 0a7f5fc474
commit efd05ea69a
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/view/LayoutInflater.java
View File

@@ -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,12 +433,12 @@ 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.
mConstructorArgs[0] = lastContext;
mConstructorArgs[1] = null;
} }
// Told retain static reference on context.
mConstructorArgs[0] = null;
mConstructorArgs[1] = null;
return result; return result;
} }
} }