commit a707c289372d5cb5ff4615fad5e539b2ba9fc5ba
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Aug 16 20:07:15 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Aug 16 20:07:15 2021 +0000
tree 98dc977f7683eafa778c5c16e2eb5d460c7f1341
parent 98f87ca8a7ffe67f3eedecdff9182fb44fe1ffcd
parent 5f4770944a88e4045f6d4c4d9be2d8855b33f859

Merge "Handle long responses by keymint IPC." into sc-dev

trusty/keymaster/Android.bp

diff --git a/trusty/keymaster/Android.bp b/trusty/keymaster/Android.bp
index ff6460d..cf056f0 100644
--- a/trusty/keymaster/Android.bp
+++ b/trusty/keymaster/Android.bp
@@ -120,6 +120,7 @@
     ],
     required: [
         "android.hardware.hardware_keystore.xml",
+        "RemoteProvisioner",
     ],
 }
 

trusty/storage/proxy/storage.c

diff --git a/trusty/storage/proxy/storage.c b/trusty/storage/proxy/storage.c
index 5b83e21..2fde30f 100644
--- a/trusty/storage/proxy/storage.c
+++ b/trusty/storage/proxy/storage.c
@@ -477,7 +477,6 @@
     if (ssdir_fd < 0) {
         ALOGE("failed to open ss root dir \"%s\": %s\n",
                dirname, strerror(errno));
-        return -1;
     }
     ssdir_name = dirname;
     return 0;