Merge "Fix bug in TaskStackBuilder#addParentStack" into jb-dev (13740708) · Commits · e / os / android_frameworks_base

core/java/android/app/TaskStackBuilder.java

+3 −9

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