drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix bug in TaskStackBuilder#addParentStack" into jb-dev

Browse Source
This commit is contained in:
Adam Powell
2012-05-08 17:02:12 -07:00
committed by Android (Google) Code Review
parent 79b7742cf1 5c43ec9328
commit 137407087b
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

@ -196,18 +196,12 @@ public class TaskStackBuilder {
try {
ActivityInfo info = pm.getActivityInfo(sourceActivityName, 0);
String parentActivity = info.parentActivityName;
Intent parent = new Intent().setComponent(
new ComponentName(info.packageName, parentActivity));
while (parent != null) {
while (parentActivity != null) {
Intent parent = new Intent().setComponent(
new ComponentName(info.packageName, parentActivity));
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");