1 files changed, 4 insertions, 16 deletions

diff --git a/host/common/include/chre_host/fragmented_load_transaction.h b/host/common/include/chre_host/fragmented_load_transaction.h
index 22f54879..98a4e562 100644
--- a/host/common/include/chre_host/fragmented_load_transaction.h
+++ b/host/common/include/chre_host/fragmented_load_transaction.h
@@ -20,12 +20,6 @@
 #include <cinttypes>
 #include <vector>
 
-#ifndef CHRE_HOST_DEFAULT_FRAGMENT_SIZE
-// Use 30KB fragment size to fit within 32KB memory fragments at the kernel
-// for most devices.
-#define CHRE_HOST_DEFAULT_FRAGMENT_SIZE (30 * 1024)
-#endif
-
 namespace android {
 namespace chre {
 
@@ -40,25 +34,22 @@ struct FragmentedLoadRequest {
   uint32_t transactionId;
   uint64_t appId;
   uint32_t appVersion;
-  uint32_t appFlags;
   uint32_t targetApiVersion;
   size_t appTotalSizeBytes;
   std::vector<uint8_t> binary;
 
   FragmentedLoadRequest(size_t fragmentId, uint32_t transactionId,
                         const std::vector<uint8_t> &binary)
-      : FragmentedLoadRequest(fragmentId, transactionId, 0, 0, 0, 0, 0,
-                              binary) {}
+      : FragmentedLoadRequest(fragmentId, transactionId, 0, 0, 0, 0, binary) {}
 
   FragmentedLoadRequest(size_t fragmentId, uint32_t transactionId,
-                        uint64_t appId, uint32_t appVersion, uint32_t appFlags,
+                        uint64_t appId, uint32_t appVersion,
                         uint32_t targetApiVersion, size_t appTotalSizeBytes,
                         const std::vector<uint8_t> &binary)
       : fragmentId(fragmentId),
         transactionId(transactionId),
         appId(appId),
         appVersion(appVersion),
-        appFlags(appFlags),
         targetApiVersion(targetApiVersion),
         appTotalSizeBytes(appTotalSizeBytes),
         binary(binary) {}
@@ -78,14 +69,12 @@ class FragmentedLoadTransaction {
    * @param transactionId the unique ID of the unfragmented load transaction
    * @param appId the unique ID of the nanoapp
    * @param appVersion the version of the nanoapp
-   * @param appFlags the flags specified by the nanoapp to be loaded.
    * @param targetApiVersion the API version this nanoapp is targeted for
    * @param appBinary the nanoapp binary data
    * @param fragmentSize the size of each fragment in bytes
    */
   FragmentedLoadTransaction(uint32_t transactionId, uint64_t appId,
-                            uint32_t appVersion, uint32_t appFlags,
-                            uint32_t targetApiVersion,
+                            uint32_t appVersion, uint32_t targetApiVersion,
                             const std::vector<uint8_t> &appBinary,
                             size_t fragmentSize = kDefaultFragmentSize);
 
@@ -116,8 +105,7 @@ class FragmentedLoadTransaction {
   size_t mCurrentRequestIndex = 0;
   uint32_t mTransactionId;
 
-  static constexpr size_t kDefaultFragmentSize =
-      CHRE_HOST_DEFAULT_FRAGMENT_SIZE;
+  static constexpr size_t kDefaultFragmentSize = 30 * 1024;
 };
 
 }  // namespace chre