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

Merge "screencap: always exit with _exit()." into oc-mr1-dev

Browse Source 
am: b92375fe9f

Change-Id: Iaab6bc269a226ceaaa217e229c8c19646209f25f
This commit is contained in:
Martijn Coenen
2017-07-27 10:18:51 +00:00
committed by android-build-merger
parent f2764ed4d5 b92375fe9f
commit bf3dc5ca6a
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cmds/screencap/screencap.cpp
View File

@@ -116,13 +116,6 @@ static status_t notifyMediaScanner(const char* fileName) {
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
// setThreadPoolMaxThreadCount(0) actually tells the kernel it's
// not allowed to spawn any additional threads, but we still spawn
// a binder thread from userspace when we call startThreadPool().
// See b/36066697 for rationale
ProcessState::self()->setThreadPoolMaxThreadCount(0);
ProcessState::self()->startThreadPool();
const char* pname = argv[0]; const char* pname = argv[0];
bool png = false; bool png = false;
int32_t displayId = DEFAULT_DISPLAY_ID; int32_t displayId = DEFAULT_DISPLAY_ID;
@@ -182,11 +175,19 @@ int main(int argc, char** argv)
ISurfaceComposer::eRotate90, // 3 == DISPLAY_ORIENTATION_270 ISurfaceComposer::eRotate90, // 3 == DISPLAY_ORIENTATION_270
}; };
// setThreadPoolMaxThreadCount(0) actually tells the kernel it's
// not allowed to spawn any additional threads, but we still spawn
// a binder thread from userspace when we call startThreadPool().
// See b/36066697 for rationale
ProcessState::self()->setThreadPoolMaxThreadCount(0);
ProcessState::self()->startThreadPool();
ScreenshotClient screenshot; ScreenshotClient screenshot;
sp<IBinder> display = SurfaceComposerClient::getBuiltInDisplay(displayId); sp<IBinder> display = SurfaceComposerClient::getBuiltInDisplay(displayId);
if (display == NULL) { if (display == NULL) {
fprintf(stderr, "Unable to get handle for display %d\n", displayId); fprintf(stderr, "Unable to get handle for display %d\n", displayId);
return 1; // b/36066697: Avoid running static destructors.
_exit(1);
} }
Vector<DisplayInfo> configs; Vector<DisplayInfo> configs;
@@ -195,7 +196,8 @@ int main(int argc, char** argv)
if (static_cast<size_t>(activeConfig) >= configs.size()) { if (static_cast<size_t>(activeConfig) >= configs.size()) {
fprintf(stderr, "Active config %d not inside configs (size %zu)\n", fprintf(stderr, "Active config %d not inside configs (size %zu)\n",
activeConfig, configs.size()); activeConfig, configs.size());
return 1; // b/36066697: Avoid running static destructors.
_exit(1);
} }
uint8_t displayOrientation = configs[activeConfig].orientation; uint8_t displayOrientation = configs[activeConfig].orientation;
uint32_t captureOrientation = ORIENTATION_MAP[displayOrientation]; uint32_t captureOrientation = ORIENTATION_MAP[displayOrientation];