From 1abffbd101f77f100789dc7fb8b33f729bb64dc9 Mon Sep 17 00:00:00 2001
From: Chris Ye <lzye@google.com>
Date: Tue, 18 Aug 2020 12:50:12 -0700
Subject: Move KeyLayoutMap from RefBase to shared_ptr.

Move KeyLayoutMap from inheriting RefBase and use shared_ptr
to store in owner class like KeyMap.

Bug: 160010896

Test: atest inputflinger, atest libinput_tests
Change-Id: I565e07bdc501af644df5ebb8388fce10af185bce
---
 libs/input/Keyboard.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'libs/input/Keyboard.cpp')

diff --git a/libs/input/Keyboard.cpp b/libs/input/Keyboard.cpp
index 25025f2963..1a64a9ca1e 100644
--- a/libs/input/Keyboard.cpp
+++ b/libs/input/Keyboard.cpp
@@ -110,11 +110,11 @@ status_t KeyMap::loadKeyLayout(const InputDeviceIdentifier& deviceIdentifier,
         return NAME_NOT_FOUND;
     }
 
-    status_t status = KeyLayoutMap::load(path, &keyLayoutMap);
-    if (status) {
-        return status;
+    base::Result<std::shared_ptr<KeyLayoutMap>> ret = KeyLayoutMap::load(path);
+    if (!ret) {
+        return ret.error().code();
     }
-
+    keyLayoutMap = *ret;
     keyLayoutFile = path;
     return OK;
 }
-- 
cgit v1.2.3-59-g8ed1b