commit 279475e4e6f2a5e663487317c69913a3ff066b1a
author Yurii Zubrytskyi <zyy@google.com> Fri Feb 18 05:55:09 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Feb 18 05:55:09 2022 +0000
tree 75bf006058bbfc925ca68ebf9067e909281658c2
parent d6ffc3b8dd63820052c89b71d0e77794dd251b86
parent 22af5f4dd072d843922e057a81f24a71dee05b50

Merge "idmap2: Remove redundant "using" statements" am: 871327e261 am: 5e0db6292d am: 22af5f4dd0

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1990330

Change-Id: Id60f75ef1d69b8f501e21ce8c1ccd8ff9f8548a6

cmds/idmap2/Android.bp

diff --git a/cmds/idmap2/Android.bp b/cmds/idmap2/Android.bp
index c134822..c202f6f 100644
--- a/cmds/idmap2/Android.bp
+++ b/cmds/idmap2/Android.bp
@@ -39,6 +39,7 @@
         "-modernize-pass-by-value",
         "-modernize-replace-disallow-copy-and-assign-macro",
         "-modernize-return-braced-init-list",
+        "-modernize-use-default-member-init",
         "-modernize-use-equals-default",
         "-modernize-use-nodiscard",
         "-modernize-use-override",

cmds/idmap2/idmap2d/Idmap2Service.cpp

diff --git a/cmds/idmap2/idmap2d/Idmap2Service.cpp b/cmds/idmap2/idmap2d/Idmap2Service.cpp
index a8d6489..1b2d905 100644
--- a/cmds/idmap2/idmap2d/Idmap2Service.cpp
+++ b/cmds/idmap2/idmap2d/Idmap2Service.cpp
@@ -39,11 +39,9 @@
 #include "idmap2/Result.h"
 #include "idmap2/SysTrace.h"
 
-using android::IPCThreadState;
 using android::base::StringPrintf;
 using android::binder::Status;
 using android::idmap2::BinaryStreamVisitor;
-using android::idmap2::FabricatedOverlay;
 using android::idmap2::FabricatedOverlayContainer;
 using android::idmap2::Idmap;
 using android::idmap2::IdmapHeader;