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

Merge "Be more tolerant in TaskStackBuilder" into jb-dev

Browse Source
This commit is contained in:
Adam Powell
2012-05-16 17:44:25 -07:00
committed by Android (Google) Code Review
parent 33ebe8c8c2 b00b8b0d53
commit 7fde8e2ba2
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/app/TaskStackBuilder.java
View File

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