Merge "idmap2: fix cpplint warnings" (ef6dcbff) · Commits · e / os / android_frameworks_base

cmds/idmap2/idmap2/Create.cpp

+1 −0

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@
		#include <fstream>
		#include <memory>
		#include <ostream>
		#include <string>
		#include <vector>

		#include "androidfw/ResourceTypes.h"

+1 −0

+2 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,8 @@
		#ifndef IDMAP2_IDMAP2D_IDMAP2SERVICE_H_
		#define IDMAP2_IDMAP2D_IDMAP2SERVICE_H_

		#include <string>

		#include <android-base/unique_fd.h>
		#include <binder/BinderService.h>
		#include <binder/Nullable.h>

+2 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,8 @@
		#include "include/idmap2/PolicyUtils.h"

		#include <sstream>
		#include <string>
		#include <vector>

		#include "android-base/strings.h"
		#include "idmap2/Policies.h"

+4 −3

Original line number	Diff line number	Diff line
		@@ -14,11 +14,12 @@
		* limitations under the License.
		*/

		#ifndef IDMAP2_INCLUDE_IDMAP2_POLICIES_H_
		#define IDMAP2_INCLUDE_IDMAP2_POLICIES_H_
		#ifndef IDMAP2_LIBIDMAP2_POLICIES_INCLUDE_IDMAP2_POLICIES_H_
		#define IDMAP2_LIBIDMAP2_POLICIES_INCLUDE_IDMAP2_POLICIES_H_

		#include <array>
		#include <string>
		#include <utility>
		#include <vector>

		#include "android-base/stringprintf.h"
		@@ -76,4 +77,4 @@ inline static std::string PoliciesToDebugString(PolicyBitmask policies) {

		} // namespace android::idmap2::policy

		#endif // IDMAP2_INCLUDE_IDMAP2_POLICIES_H_
		#endif // IDMAP2_LIBIDMAP2_POLICIES_INCLUDE_IDMAP2_POLICIES_H_