Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00c8a815 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by android-build-merger
Browse files

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

am: e76ffd19

* commit 'e76ffd19':
  Work on issue #28200735: AcitvityManagerService lock held for...

Change-Id: If225daf53ecb6fb2d0548cd61ec2c3fde7a879e3
parents d952ef46 e76ffd19

services/core/java/com/android/server/am/ActivityManagerService.java

+4 −4
Original line number Diff line number Diff line
@@ -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) {