Merge "Trace screenshotApplications" into nyc-dev am: f7eaef5

am: 030ee35

* commit '030ee35f3e95f4b2247e5ad52e11880726eacc98':
  Trace screenshotApplications

Change-Id: I4986d6c3c352c5caaff68582b142b24e96384b46
This commit is contained in:
Jorim Jaggi
2016-04-13 21:04:52 +00:00
committed by android-build-merger

View File

@@ -6021,7 +6021,13 @@ public class WindowManagerService extends IWindowManager.Stub
"screenshotApplications()")) {
throw new SecurityException("Requires READ_FRAME_BUFFER permission");
}
return screenshotApplicationsInner(appToken, displayId, width, height, false, frameScale);
try {
Trace.traceBegin(Trace.TRACE_TAG_WINDOW_MANAGER, "screenshotApplications");
return screenshotApplicationsInner(appToken, displayId, width, height, false,
frameScale);
} finally {
Trace.traceEnd(Trace.TRACE_TAG_WINDOW_MANAGER);
}
}
Bitmap screenshotApplicationsInner(IBinder appToken, int displayId, int width, int height,