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

am 42090723: am fbd5acbf: am 42540aed: am d2e6afcb: am bb9b4e06: Merge "Fix issue #17609716: Frequent crash in system_server (RT restarts)" into lmp-dev

Browse Source 
* commit '42090723ad34b6260edd8c8331a997d85b7d4b68':
  Fix issue #17609716: Frequent crash in system_server (RT restarts)
This commit is contained in:
Dianne Hackborn
2014-09-23 16:20:53 +00:00
committed by Android Git Automerger
parent 8c437b99d4 7367ed9aa9
commit 2351584634
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/am/ActiveServices.java
View File

@@ -2351,7 +2351,7 @@ public final class ActiveServices {
void serviceTimeout(ProcessRecord proc) {
String anrMessage = null;
synchronized(this) {
synchronized(mAm) {
if (proc.executingServices.size() == 0 || proc.thread == null) {
return;
}
@@ -2647,7 +2647,7 @@ public final class ActiveServices {
int opti, boolean dumpAll) {
ArrayList<ServiceRecord> services = new ArrayList<ServiceRecord>();
synchronized (this) {
synchronized (mAm) {
int[] users = mAm.getUsersLocked();
if ("all".equals(name)) {
for (int user : users) {
@@ -2721,7 +2721,7 @@ public final class ActiveServices {
private void dumpService(String prefix, FileDescriptor fd, PrintWriter pw,
final ServiceRecord r, String[] args, boolean dumpAll) {
String innerPrefix = prefix + " ";
synchronized (this) {
synchronized (mAm) {
pw.print(prefix); pw.print("SERVICE ");
pw.print(r.shortName); pw.print(" ");
pw.print(Integer.toHexString(System.identityHashCode(r)));