| commit | bbbfdc3c5cf7c8594012f8fcb0dc55ea0a3eddee | [log] [tgz] |
|---|---|---|
| author | Kangping Dong <wgtdkp@google.com> | Tue Nov 07 06:36:12 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Nov 07 06:36:12 2023 +0000 |
| tree | b6b650f35fb216ce9bd243dac18e1fd1f09a259c | |
| parent | 2b2b7bbbb9f3f3496b99f0501282a5ea0dd0f0bd [diff] | |
| parent | 289ec28259369c2619ddf85e2fe96ddfa5dc4e33 [diff] |
Merge "[Thread] add a script for make-pretty" into main am: 289ec28259 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2815932 Change-Id: Ifaa529cef41f1a024dd344afe4f87a5f46833630 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/thread/framework/java/android/net/thread/ThreadNetworkController.java b/thread/framework/java/android/net/thread/ThreadNetworkController.java index 7575757..fc77b1a 100644 --- a/thread/framework/java/android/net/thread/ThreadNetworkController.java +++ b/thread/framework/java/android/net/thread/ThreadNetworkController.java
@@ -31,7 +31,7 @@ * Provides the primary API for controlling all aspects of a Thread network. * * @hide -*/ + */ @FlaggedApi(ThreadNetworkFlags.FLAG_THREAD_ENABLED) @SystemApi public final class ThreadNetworkController {
diff --git a/thread/scripts/make-pretty.sh b/thread/scripts/make-pretty.sh new file mode 100755 index 0000000..e4bd459 --- /dev/null +++ b/thread/scripts/make-pretty.sh
@@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) + +GOOGLE_JAVA_FORMAT=$SCRIPT_DIR/../../../../../prebuilts/tools/common/google-java-format/google-java-format + +$GOOGLE_JAVA_FORMAT --aosp -i $(find $SCRIPT_DIR/../ -name "*.java")