tag baaac3e241e6fec86ad2f6458583a3f8bb69f170
tagger The Android Open Source Project <initial-contribution@android.com> Mon Jan 04 15:11:37 2021 -0800
object f04eb1c7a806d524d923daef6f7992a78fb3169d

Android security 9.0.0 release 64

commit f04eb1c7a806d524d923daef6f7992a78fb3169d
author Elliott Hughes <enh@google.com> Mon Aug 17 12:37:25 2020 -0700
committer Anis Assi <anisassi@google.com> Thu Sep 10 13:50:59 2020 -0700
tree aa84149e5484c38564de3ad6ca607343c94fcd91
parent 88bf88e98926ab43f27653e283d0eb05a7f1ca98

FileMap::create: remove duplicate addition.

The previous change was intended to detect the overflow, but
accidentally retained the existing addition, so we'd abort before
getting to the explicit check.

Also reformat slightly to better match the current code in qt-dev and
beyond, to reduce merge conflicts.

Bug: 156997193
Test: treehugger
Change-Id: I73a3a4e75f0aad00888e8f2b49a07b7e8b4eda05
Merged-In: I73a3a4e75f0aad00888e8f2b49a07b7e8b4eda05
(cherry picked from commit 54794ac613d50bf4072174476f60527e2b0b4cdf)