From 4425ec0dc64049b38a1cb958b549c1dad9971484 Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@google.com>
Date: Wed, 22 Jun 2022 15:39:40 +0000
Subject: [PATCH] Revert "Force-initialize potential padding area."

This reverts commit e33af7fe3782a0c295ef2cd3b588632ecfcc00a4.

Reason for revert: b/236673494

Bug: 213170822
Bug: 236673494
Change-Id: I07c971f0f3dabf15301d62b15e3b44760151097f
---
 libs/androidfw/CursorWindow.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/libs/androidfw/CursorWindow.cpp b/libs/androidfw/CursorWindow.cpp
index 87ae45bedd67e..3527eeead1d59 100644
--- a/libs/androidfw/CursorWindow.cpp
+++ b/libs/androidfw/CursorWindow.cpp
@@ -227,7 +227,6 @@ status_t CursorWindow::writeToParcel(Parcel* parcel) {
         if (!dest) goto fail;
         memcpy(static_cast<uint8_t*>(dest),
                 static_cast<uint8_t*>(mData), mAllocOffset);
-        memset(static_cast<uint8_t*>(dest) + mAllocOffset, 0, 4);
         memcpy(static_cast<uint8_t*>(dest) + compactedSize - slotsSize,
                 static_cast<uint8_t*>(mData) + mSlotsOffset, slotsSize);
     }