Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb3f8108 authored Nov 25, 2020 by Treehugger Robot Committed by Automerger Merge Worker Nov 25, 2020

Merge "remove extra semicolons [-Wextra-semi]" am: b0379e37 am: 9baa2fe6 am: 0ee3c1e2

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1508298

Change-Id: Iacc3bffe2b560f841b3ef223f2b6e5c2e05d6f2b

parents 99ccd85e 0ee3c1e2

libs/binder/Android.bp

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -145,6 +145,7 @@ cc_library {
	cflags: [		cflags: [
	"-Wall",		"-Wall",
	"-Wextra",		"-Wextra",
			"-Wextra-semi",
	"-Werror",		"-Werror",
	"-Wzero-as-null-pointer-constant",		"-Wzero-as-null-pointer-constant",
	"-DANDROID_BASE_UNIQUE_FD_DISABLE_IMPLICIT_CONVERSION",		"-DANDROID_BASE_UNIQUE_FD_DISABLE_IMPLICIT_CONVERSION",

libs/binder/IActivityManager.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -135,6 +135,6 @@ public:

	// ------------------------------------------------------------------------------------		// ------------------------------------------------------------------------------------

	IMPLEMENT_META_INTERFACE(ActivityManager, "android.app.IActivityManager");		IMPLEMENT_META_INTERFACE(ActivityManager, "android.app.IActivityManager")

	} // namespace android		} // namespace android

libs/binder/IAppOpsCallback.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -43,7 +43,7 @@ public:
	}		}
	};		};

	IMPLEMENT_META_INTERFACE(AppOpsCallback, "com.android.internal.app.IAppOpsCallback");		IMPLEMENT_META_INTERFACE(AppOpsCallback, "com.android.internal.app.IAppOpsCallback")

	// ----------------------------------------------------------------------		// ----------------------------------------------------------------------

libs/binder/IAppOpsService.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -162,7 +162,7 @@ public:
	}		}
	};		};

	IMPLEMENT_META_INTERFACE(AppOpsService, "com.android.internal.app.IAppOpsService");		IMPLEMENT_META_INTERFACE(AppOpsService, "com.android.internal.app.IAppOpsService")

	// ----------------------------------------------------------------------		// ----------------------------------------------------------------------

libs/binder/IBatteryStats.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -130,7 +130,7 @@ public:

	};		};

	IMPLEMENT_META_INTERFACE(BatteryStats, "com.android.internal.app.IBatteryStats");		IMPLEMENT_META_INTERFACE(BatteryStats, "com.android.internal.app.IBatteryStats")

	// ----------------------------------------------------------------------		// ----------------------------------------------------------------------