Simplify formatter interface to use std::string

This simplifies the formatter interface and adds annotations to indicate
that log functions expect format strings.

The compiler will now perform checking on the logging strings used, and
fixes a series of logging issues.

Change-Id: Icc899f4579f2ceb431d9ef81cd50ee9d0d6f07d2

2 files changed, 20 insertions, 19 deletions

diff --git a/host-common/include/host-common/AndroidAsyncMessagePipe.h b/host-common/include/host-common/AndroidAsyncMessagePipe.h
index 11956c2..69e1d08 100644
--- a/host-common/include/host-common/AndroidAsyncMessagePipe.h
+++ b/host-common/include/host-common/AndroidAsyncMessagePipe.h
@@ -13,24 +13,25 @@
 // limitations under the License.
 #pragma once
 
-#include <stddef.h>  // for size_t
+#include <stddef.h>
+
 #include <array>
-#include <cstdint>     // for uint8_t, uint32_t
-#include <functional>  // for function
-#include <list>        // for list
-#include <memory>      // for unique_ptr
-#include <mutex>       // for recursive_mutex
+#include <cstdint>
+#include <functional>
+#include <list>
+#include <memory>
+#include <mutex>
 #include <string>
-#include <unordered_map>  // for operator!=, unord...
-#include <utility>        // for move
-#include <vector>         // for vector
-
-#include "aemu/base/Optional.h"                  // for Optional
-#include "aemu/base/files/Stream.h"              // for Stream
-#include "aemu/base/logging/CLog.h"                    // for dprint
-#include "aemu/base/synchronization/Lock.h"      // for AutoLock, Lock
-#include "host-common/AndroidPipe.h"          // for AndroidPipe, Andr...
-#include "host-common/android_pipe_common.h"  // for AndroidPipeBuffer
+#include <unordered_map>
+#include <utility>
+#include <vector>
+
+#include "aemu/base/Optional.h"
+#include "aemu/base/files/Stream.h"
+#include "aemu/base/logging/Log.h"
+#include "aemu/base/synchronization/Lock.h"
+#include "host-common/AndroidPipe.h"
+#include "host-common/android_pipe_common.h"
 
 // This is a utility class that can help implement message-based remote calls
 // between the host and guest, with optional out-of-band responses.
diff --git a/host-common/include/host-common/MultiDisplay.h b/host-common/include/host-common/MultiDisplay.h
index 492af61..909d840 100644
--- a/host-common/include/host-common/MultiDisplay.h
+++ b/host-common/include/host-common/MultiDisplay.h
@@ -130,9 +130,9 @@ public:
     // 0 for default Android display
     // 1-5 for Emulator UI
     // 6-10 for developer from rcControl
-    static const uint32_t s_displayIdInternalBegin = 6;
-    static const uint32_t s_maxNumMultiDisplay = 11;
-    static const uint32_t s_invalidIdMultiDisplay = 0xFFFFFFAB;
+    static constexpr uint32_t s_displayIdInternalBegin = 6;
+    static constexpr uint32_t s_maxNumMultiDisplay = 11;
+    static constexpr uint32_t s_invalidIdMultiDisplay = 0xFFFFFFAB;
 
 private:
     const QAndroidEmulatorWindowAgent* mWindowAgent;