From b4f24501f71a6eb005de4b1cc87d2876a6bbac04 Mon Sep 17 00:00:00 2001
From: Martin Stjernholm <mast@google.com>
Date: Sat, 18 Mar 2023 01:04:20 +0000
Subject: [PATCH] Align clang-format with the Checkstyle hook for short
 functions.

The latter doesn't allow non-empty methods on a single line. This is
the same in both C++ and Java. Test CL: https://r.android.com/2507738

#codehealth

Test: repo upload on a file with a short non-empty class method
      in C++ and Java formatted on multiple lines by clang-format.
Test: repo upload on a file with a short empty class method
      in C++ and Java formatted on a single line by clang-format.
Bug: 123456789
Change-Id: I9795cd753f0f31be97652859f5bd8b5ce3427c55
---
 .clang-format | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.clang-format b/.clang-format
index 03af56d64062a..021d9382d62be 100644
--- a/.clang-format
+++ b/.clang-format
@@ -2,7 +2,7 @@ BasedOnStyle: Google
 
 AccessModifierOffset: -4
 AlignOperands: false
-AllowShortFunctionsOnASingleLine: Inline
+AllowShortFunctionsOnASingleLine: Empty
 AlwaysBreakBeforeMultilineStrings: false
 ColumnLimit: 100
 CommentPragmas: NOLINT:.*