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

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

Browse Source 
* commit '7fde8e2ba27942ed61a1d57f63f3b4eea3e0bbc8':
  Be more tolerant in TaskStackBuilder
This commit is contained in:
Adam Powell
2012-05-16 17:47:18 -07:00
committed by Android Git Automerger
parent 7ce7fe3b61 7fde8e2ba2
commit 8afcf70531
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( ActivityInfo info = pm.getActivityInfo(
new ComponentName(mSourceContext, sourceActivityClass), 0); new ComponentName(mSourceContext, sourceActivityClass), 0);
String parentActivity = info.parentActivityName; String parentActivity = info.parentActivityName;
Intent parent = new Intent().setComponent( while (parentActivity != null) {
new ComponentName(mSourceContext, parentActivity)); Intent parent = new Intent().setComponent(
while (parent != null) { new ComponentName(mSourceContext, parentActivity));
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");