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

Merge change I237c1cee into eclair-mr2

Browse Source 
* changes:
  Improve exception message thrown when a View's state is of the wrong type.
This commit is contained in:
Android (Google) Code Review
2009-12-08 11:32:50 -08:00
parent 24eca800d4 237c1ceea3
commit 06ffc12a39
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/view/View.java
View File

@@ -5961,7 +5961,11 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility
protected void onRestoreInstanceState(Parcelable state) { protected void onRestoreInstanceState(Parcelable state) {
mPrivateFlags |= SAVE_STATE_CALLED; mPrivateFlags |= SAVE_STATE_CALLED;
if (state != BaseSavedState.EMPTY_STATE && state != null) { if (state != BaseSavedState.EMPTY_STATE && state != null) {
throw new IllegalArgumentException("Wrong state class -- expecting View State"); throw new IllegalArgumentException("Wrong state class, expecting View State but "
+ "received " + state.getClass().toString() + " instead. This usually happens "
+ "when two views of different type have the same id in the same hierarchy. "
+ "This view's id is " + ViewDebug.resolveId(mContext, getId()) + ". Make sure "
+ "other views do not use the same id.");
} }
} }

2
core/java/android/view/ViewDebug.java
View File

@@ -1300,7 +1300,7 @@ public class ViewDebug {
} }
} }
private static Object resolveId(Context context, int id) { static Object resolveId(Context context, int id) {
Object fieldValue; Object fieldValue;
final Resources resources = context.getResources(); final Resources resources = context.getResources();
if (id >= 0) { if (id >= 0) {