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

am 8afcf705: am 7fde8e2b: Merge "Be more tolerant in TaskStackBuilder" into jb-dev

Browse Source 
* commit '8afcf70531298de6f79874e0655431322e441606':
  Be more tolerant in TaskStackBuilder
This commit is contained in:
Adam Powell
2012-05-17 17:18:08 -07:00
committed by Android Git Automerger
parent 148e0b7a1d 8afcf70531
commit db03e5fee8
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");