commit 8563e2137a5574b28dbc0abb6934460907e4d652
author The Android Automerger <android-build@google.com> Sun May 26 05:55:38 2013 -0700
committer The Android Automerger <android-build@google.com> Sun May 26 05:55:38 2013 -0700
tree 21af49475e4fe6fdf6a205416ed3a712acbe20b9
parent 2f61bcadb10697036a5ce5ad893607f5dcdcda9d
parent 5b2424e2f809df6b51a86968b393200305164278

merge in jb-mr2-release history after reset to jb-mr2-dev

src/com/android/nfc/P2pLinkManager.java

diff --git a/src/com/android/nfc/P2pLinkManager.java b/src/com/android/nfc/P2pLinkManager.java
index 29afe95..fb83e18 100755
--- a/src/com/android/nfc/P2pLinkManager.java
+++ b/src/com/android/nfc/P2pLinkManager.java
@@ -400,7 +400,7 @@
             String runningPackage = null;
             List<RunningTaskInfo> tasks = mActivityManager.getRunningTasks(1);
             if (tasks.size() > 0) {
-                runningPackage = tasks.get(0).baseActivity.getPackageName();
+                runningPackage = tasks.get(0).topActivity.getPackageName();
             }
 
             if (runningPackage == null) {