Merge "Be more tolerant in TaskStackBuilder" into jb-dev (7fde8e2b) · Commits · e / os / android_frameworks_base

core/java/android/app/TaskStackBuilder.java

+3 −9

Original line number	Original line	Diff line number	Diff line
	@@ -161,18 +161,12 @@ public class TaskStackBuilder {
	ActivityInfo info = pm.getActivityInfo(		ActivityInfo info = pm.getActivityInfo(
	new ComponentName(mSourceContext, sourceActivityClass), 0);		new ComponentName(mSourceContext, sourceActivityClass), 0);
	String parentActivity = info.parentActivityName;		String parentActivity = info.parentActivityName;
			while (parentActivity != null) {
	Intent parent = new Intent().setComponent(		Intent parent = new Intent().setComponent(
	new ComponentName(mSourceContext, parentActivity));		new ComponentName(mSourceContext, parentActivity));
	while (parent != null) {
	mIntents.add(insertAt, parent);		mIntents.add(insertAt, parent);
	info = pm.getActivityInfo(parent.getComponent(), 0);		info = pm.getActivityInfo(parent.getComponent(), 0);
	parentActivity = info.parentActivityName;		parentActivity = info.parentActivityName;
	if (parentActivity != null) {
	parent = new Intent().setComponent(
	new ComponentName(mSourceContext, parentActivity));
	} else {
	parent = null;
	}
	}		}
	} catch (NameNotFoundException e) {		} catch (NameNotFoundException e) {
	Log.e(TAG, "Bad ComponentName while traversing activity parent metadata");		Log.e(TAG, "Bad ComponentName while traversing activity parent metadata");