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

am e01538f2: Merge "TaskStackBuilder - use the correct package for looking up parents" into jb-mr1-dev

Browse Source 
* commit 'e01538f28b0e9bd0174d5e3f315747b3725b5bd4':
  TaskStackBuilder - use the correct package for looking up parents
This commit is contained in:
Adam Powell
2012-09-17 13:56:16 -07:00
committed by Android Git Automerger
parent 39b9c91ebf e01538f28b
commit 3987a03261
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -162,7 +162,7 @@ public class TaskStackBuilder {
ActivityInfo info = pm.getActivityInfo(sourceActivityName, 0); ActivityInfo info = pm.getActivityInfo(sourceActivityName, 0);
String parentActivity = info.parentActivityName; String parentActivity = info.parentActivityName;
while (parentActivity != null) { while (parentActivity != null) {
final ComponentName target = new ComponentName(mSourceContext, parentActivity); final ComponentName target = new ComponentName(info.packageName, parentActivity);
info = pm.getActivityInfo(target, 0); info = pm.getActivityInfo(target, 0);
parentActivity = info.parentActivityName; parentActivity = info.parentActivityName;
final Intent parent = parentActivity == null && insertAt == 0 final Intent parent = parentActivity == null && insertAt == 0