summaryrefslogtreecommitdiffstats
path: root/services/java/com/android/server/am/ActivityManagerService.java
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-01-19 15:36:42 -0800
committerDianne Hackborn <hackbod@google.com>2010-01-19 15:36:42 -0800
commitb1c4a2a3b37fccf68e6a9563cccf1685df2bf3e7 (patch)
tree82eaa515232769b237fc3c38cdbacc7b1ba5bd7f /services/java/com/android/server/am/ActivityManagerService.java
parent6866daee6a18992e8f2c9a948e873bbfc2090fb0 (diff)
downloadframeworks_base-b1c4a2a3b37fccf68e6a9563cccf1685df2bf3e7.zip
frameworks_base-b1c4a2a3b37fccf68e6a9563cccf1685df2bf3e7.tar.gz
frameworks_base-b1c4a2a3b37fccf68e6a9563cccf1685df2bf3e7.tar.bz2
Fix issue #2364506: Phone locked up while listening to music and attempting to download an update
Make sure calls into the notification manager are not done with the activity manager lock held. Change-Id: Ib53c3b9f46160d94ee1e7079b1a5123e0d1225d8
Diffstat (limited to 'services/java/com/android/server/am/ActivityManagerService.java')
-rw-r--r--services/java/com/android/server/am/ActivityManagerService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java
index f3cba69..20ccfdc 100644
--- a/services/java/com/android/server/am/ActivityManagerService.java
+++ b/services/java/com/android/server/am/ActivityManagerService.java
@@ -10276,7 +10276,7 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
sInfo.applicationInfo.uid, sInfo.packageName,
sInfo.name);
}
- r = new ServiceRecord(ss, name, filter, sInfo, res);
+ r = new ServiceRecord(this, ss, name, filter, sInfo, res);
res.setService(r);
mServices.put(name, r);
mServicesByIntent.put(filter, r);