Merge "[SurfaceFlinger] Replace NULL with nullptr."
diff --git a/cmds/installd/dexopt.cpp b/cmds/installd/dexopt.cpp
index 7a95c78..2e88e3c 100644
--- a/cmds/installd/dexopt.cpp
+++ b/cmds/installd/dexopt.cpp
@@ -417,7 +417,9 @@
// Disable cdex if update input vdex is true since this combination of options is not
// supported.
- const bool disable_cdex = input_vdex_fd == output_vdex_fd;
+ // Disable cdex for non-background compiles since we don't want to regress app install until
+ // there are enough benefits to justify the tradeoff.
+ const bool disable_cdex = !background_job_compile || (input_vdex_fd == output_vdex_fd);
const char* argv[9 // program name, mandatory arguments and the final NULL
+ (have_dex2oat_isa_variant ? 1 : 0)
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 0210592..e967265 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -4245,7 +4245,7 @@
reply->writeBool(hasWideColorDisplay);
return NO_ERROR;
}
- case 1025: { // tracing
+ case 1025: { // Set layer tracing
n = data.readInt32();
if (n) {
ALOGV("LayerTracing enabled");
@@ -4259,6 +4259,10 @@
}
return NO_ERROR;
}
+ case 1026: { // Get layer tracing status
+ reply->writeBool(mTracing.isEnabled());
+ return NO_ERROR;
+ }
}
}
return err;
@@ -4306,7 +4310,7 @@
}
status_t SurfaceFlinger::captureLayers(const sp<IBinder>& layerHandleBinder,
- sp<GraphicBuffer>* outBuffer, const Rect& sourceCrop,
+ sp<GraphicBuffer>* outBuffer, const Rect& sourceCrop,
float frameScale) {
ATRACE_CALL();