commit 6468bf7af05c5fc64bfd924a277753dce9d1bf56
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Jan 04 00:34:49 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Jan 04 00:34:49 2020 +0000
tree d26027a4b7a834643e71dfd0efbef939e5b52f6d
parent 0fcb66ce5dca88d6047abc95dee71bedf7fdb784
parent 432553b754ecd332e7f676b8a1b725420e1983dc

Merge "trusty:storageproxyd: Add ufs to parse_dev_type" am: d363769dcf am: 22ad80da60 am: ebbc388197

Change-Id: Iaac6df89e59ba939b4a64a41854ff36b3e89c992

trusty/storage/proxy/proxy.c

diff --git a/trusty/storage/proxy/proxy.c b/trusty/storage/proxy/proxy.c
index 5f56408..e230941 100644
--- a/trusty/storage/proxy/proxy.c
+++ b/trusty/storage/proxy/proxy.c
@@ -48,6 +48,8 @@
         return VIRT_RPMB;
     } else if (!strcmp(dev_type_name, "sock")) {
         return SOCK_RPMB;
+    } else if (!strcmp(dev_type_name, "ufs")) {
+        return UFS_RPMB;
     } else {
         return UNKNOWN_RPMB;
     }