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

Merge "Work on issue #28200735: AcitvityManagerService lock held for..." into nyc-dev

Browse Source
This commit is contained in:
Dianne Hackborn
2016-05-03 23:41:45 +00:00
committed by Android (Google) Code Review
parent 66a440a320 0d3c578a80
commit e76ffd19a4
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -10320,9 +10320,9 @@ public final class ActivityManagerService extends ActivityManagerNative
}
private void checkTime(long startTime, String where) {
long now = SystemClock.elapsedRealtime();
if ((now-startTime) > 1000) {
// If we are taking more than a second, log about it.
long now = SystemClock.uptimeMillis();
if ((now-startTime) > 50) {
// If we are taking more than 50ms, log about it.
Slog.w(TAG, "Slow operation: " + (now-startTime) + "ms so far, now at " + where);
}
}
@@ -10334,7 +10334,7 @@ public final class ActivityManagerService extends ActivityManagerNative
ProviderInfo cpi = null;
synchronized(this) {
long startTime = SystemClock.elapsedRealtime();
long startTime = SystemClock.uptimeMillis();
ProcessRecord r = null;
if (caller != null) {