commit 08e5bd0ae2334b113c91a08fe3a0ef4afe4136e0
author Bill Peckham <bpeckham@google.com> Tue Feb 25 16:23:13 2020 -0800
committer Bill Peckham <bpeckham@google.com> Fri Feb 28 22:17:42 2020 +0000
tree fb9b04b8bbe90c01bc550ac19b10571878f8e902
parent 96187461b250937b53e6f7c8a92bfb3ef41aee5d

Upstream #include "KeyUtil.h" breaks fs_mgr_format.cpp

Partner changes caused build break (details in the
bug). This change removes the unused partner changes.

Bug: 150246237
Change-Id: I291c862499a43f1376866aac0b3908048832e65e

KeyStorage.h

diff --git a/KeyStorage.h b/KeyStorage.h
index 2d72ade..b4645b8 100644
--- a/KeyStorage.h
+++ b/KeyStorage.h
@@ -17,9 +17,8 @@
 #ifndef ANDROID_VOLD_KEYSTORAGE_H
 #define ANDROID_VOLD_KEYSTORAGE_H
 
-#include "Keymaster.h"
 #include "KeyBuffer.h"
-#include <cutils/multiuser.h>
+
 #include <string>
 
 namespace android {

KeyUtil.cpp

diff --git a/KeyUtil.cpp b/KeyUtil.cpp
index 3e15fdb..42a20a5 100644
--- a/KeyUtil.cpp
+++ b/KeyUtil.cpp
@@ -34,10 +34,6 @@
 #include "KeyStorage.h"
 #include "Utils.h"
 
-#define MAX_USER_ID 0xFFFFFFFF
-
-using android::hardware::keymaster::V4_0::KeyFormat;
-using android::vold::KeyType;
 namespace android {
 namespace vold {
 

KeyUtil.h

diff --git a/KeyUtil.h b/KeyUtil.h
index ba24fcb..dcb1dc7 100644
--- a/KeyUtil.h
+++ b/KeyUtil.h
@@ -19,7 +19,6 @@
 
 #include "KeyBuffer.h"
 #include "KeyStorage.h"
-#include "Keymaster.h"
 
 #include <fscrypt/fscrypt.h>