commit 457b1601e1ff5dff435df98633881e67b17e5c24
author Siarhei Vishniakou <svv@google.com> Wed Feb 20 16:26:12 2019 -0600
committer Siarhei Vishniakou <svv@google.com> Wed Feb 20 16:26:12 2019 -0600
tree 362f6f075516dece1f32c65570e3bd9351e5bc7c
parent dca779140d506bec4e81d4cedf61e9bf3d8b8a6f

Update VirtualKeyMap usage

Since the VirtualKeyMap has been refactored, updated the
validation tool to use the new signature.

Bug: 113575658
Test: atest libinput_tests inputflinger_tests

Change-Id: Ifb0eb5b2913020f1e1402dcb6a36c9038c345807

tools/validatekeymaps/Main.cpp

diff --git a/tools/validatekeymaps/Main.cpp b/tools/validatekeymaps/Main.cpp
index f31f771..56a242f 100644
--- a/tools/validatekeymaps/Main.cpp
+++ b/tools/validatekeymaps/Main.cpp
@@ -128,13 +128,11 @@
     }
 
     case FILETYPE_VIRTUALKEYDEFINITION: {
-        VirtualKeyMap* map;
-        status_t status = VirtualKeyMap::load(filename, &map);
-        if (status) {
-            error("Error %d parsing virtual key definition file.\n\n", status);
+        std::unique_ptr<VirtualKeyMap> map = VirtualKeyMap::load(filename);
+        if (!map) {
+            error("Error while parsing virtual key definition file.\n\n");
             return false;
         }
-        delete map;
         break;
     }
     }