diff options
| author | Adam Powell <adamp@google.com> | 2012-09-17 13:54:31 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-17 13:54:31 -0700 |
| commit | e01538f28b0e9bd0174d5e3f315747b3725b5bd4 (patch) | |
| tree | cdb76a8eace0ee34d5b49c715f7cdbe3c9d5b6e6 /core | |
| parent | e2fb51900cb6df51b2dffc80c35ecbbaf47d3f4b (diff) | |
| parent | 6b6c90523ed8779aa962ff4f5ef8c368a96269e2 (diff) | |
| download | frameworks_base-e01538f28b0e9bd0174d5e3f315747b3725b5bd4.zip frameworks_base-e01538f28b0e9bd0174d5e3f315747b3725b5bd4.tar.gz frameworks_base-e01538f28b0e9bd0174d5e3f315747b3725b5bd4.tar.bz2 | |
Merge "TaskStackBuilder - use the correct package for looking up parents" into jb-mr1-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/app/TaskStackBuilder.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/TaskStackBuilder.java b/core/java/android/app/TaskStackBuilder.java index 9c83362..63987f1 100644 --- a/core/java/android/app/TaskStackBuilder.java +++ b/core/java/android/app/TaskStackBuilder.java @@ -162,7 +162,7 @@ public class TaskStackBuilder { ActivityInfo info = pm.getActivityInfo(sourceActivityName, 0); String parentActivity = info.parentActivityName; while (parentActivity != null) { - final ComponentName target = new ComponentName(mSourceContext, parentActivity); + final ComponentName target = new ComponentName(info.packageName, parentActivity); info = pm.getActivityInfo(target, 0); parentActivity = info.parentActivityName; final Intent parent = parentActivity == null && insertAt == 0 |