commit ba879c75bd5228872d8f1e9cbde11536a36bc85b
author Treehugger Robot <treehugger-gerrit@google.com> Mon Jan 27 23:13:26 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 27 23:13:26 2020 +0000
tree 5b7cf3a290b279965f1749b939f7765598348d3a
parent 873f1e24e4a676f322490aec72a8f3ee6b2b42f2
parent b0491f89e880967e3b1c196df60cb96293e4b576

Merge "libtimeinstate: tolerate multiple calls to startTrackingUidTimes"

cmds/cmd/cmd.cpp

diff --git a/cmds/cmd/cmd.cpp b/cmds/cmd/cmd.cpp
index 7b4aeb2..8dad475 100644
--- a/cmds/cmd/cmd.cpp
+++ b/cmds/cmd/cmd.cpp
@@ -223,7 +223,8 @@
     sp<MyResultReceiver> result = new MyResultReceiver();
 
 #if DEBUG
-    ALOGD("cmd: Invoking %s in=%d, out=%d, err=%d", cmd, in, out, err);
+    ALOGD("cmd: Invoking %.*s in=%d, out=%d, err=%d",
+          static_cast<int>(cmd.size()), cmd.data(), in, out, err);
 #endif
 
     // TODO: block until a result is returned to MyResultReceiver.

libs/dumputils/dump_utils.cpp

diff --git a/libs/dumputils/dump_utils.cpp b/libs/dumputils/dump_utils.cpp
index a772e57..0ede8b1 100644
--- a/libs/dumputils/dump_utils.cpp
+++ b/libs/dumputils/dump_utils.cpp
@@ -55,6 +55,7 @@
         "android.hardware.audio@2.0::IDevicesFactory",
         "android.hardware.audio@4.0::IDevicesFactory",
         "android.hardware.audio@5.0::IDevicesFactory",
+        "android.hardware.audio@6.0::IDevicesFactory",
         "android.hardware.biometrics.face@1.0::IBiometricsFace",
         "android.hardware.bluetooth@1.0::IBluetoothHci",
         "android.hardware.camera.provider@2.4::ICameraProvider",