From f2be286fde3ac40cf95b03ee74849ab78656eaf7 Mon Sep 17 00:00:00 2001 From: Handa Wang Date: Thu, 8 Aug 2024 09:09:15 +0000 Subject: [PATCH 1/2] [Thread] enhance make-pretty.sh - Support formatting AIDL files. I found the formatter from b/144540481. - Support working for other Thread repos like external/ot-br-posix. Test: verified locally Change-Id: I805af4989c80629264b53f46fa58afa4a04bb26f --- thread/scripts/make-pretty.sh | 36 ++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/thread/scripts/make-pretty.sh b/thread/scripts/make-pretty.sh index c176bfa2ac..e012d4112f 100755 --- a/thread/scripts/make-pretty.sh +++ b/thread/scripts/make-pretty.sh @@ -1,9 +1,35 @@ #!/usr/bin/env bash -SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) +ANDROID_ROOT_DIR=$( + while [ ! -d ".repo" ] && [ "$PWD" != "/" ]; do cd ..; done + pwd +) -GOOGLE_JAVA_FORMAT=$SCRIPT_DIR/../../../../../prebuilts/tools/common/google-java-format/google-java-format -ANDROID_BP_FORMAT=$SCRIPT_DIR/../../../../../prebuilts/build-tools/linux-x86/bin/bpfmt +if [ ! -d "$ANDROID_ROOT_DIR/.repo" ]; then + echo "Error: The script has to run in an Android repo checkout" + exit 1 +fi -$GOOGLE_JAVA_FORMAT --aosp -i $(find $SCRIPT_DIR/../ -name "*.java") -$ANDROID_BP_FORMAT -w $(find $SCRIPT_DIR/../ -name "*.bp") +GOOGLE_JAVA_FORMAT=$ANDROID_ROOT_DIR/prebuilts/tools/common/google-java-format/google-java-format +ANDROID_BP_FORMAT=$ANDROID_ROOT_DIR/prebuilts/build-tools/linux-x86/bin/bpfmt +AIDL_FORMAT=$ANDROID_ROOT_DIR/system/tools/aidl/aidl-format.sh + +CONNECTIVITY_DIR=$ANDROID_ROOT_DIR/packages/modules/Connectivity +OPENTHREAD_DIR=$ANDROID_ROOT_DIR/external/openthread +OTBR_POSIX_DIR=$ANDROID_ROOT_DIR/external/ot-br-posix + +ALLOWED_CODE_DIRS=($CONNECTIVITY_DIR $OPENTHREAD_DIR $OTBR_POSIX_DIR) +CODE_DIR=$(git rev-parse --show-toplevel) + +if [[ ! " ${ALLOWED_CODE_DIRS[@]} " =~ " ${CODE_DIR} " ]]; then + echo "Error: The script has to run in the Git project Connectivity, openthread or ot-br-posix" + exit 1 +fi + +if [[ $CODE_DIR == $CONNECTIVITY_DIR ]]; then + CODE_DIR=$CODE_DIR"/thread" +fi + +$GOOGLE_JAVA_FORMAT --aosp -i $(find $CODE_DIR -name "*.java") +$ANDROID_BP_FORMAT -w $(find $CODE_DIR -name "*.bp") +$AIDL_FORMAT -w $(find $CODE_DIR -name "*.aidl") From 396db6050cf4d152be97d5d74b5561b28f6c3a19 Mon Sep 17 00:00:00 2001 From: Handa Wang Date: Thu, 8 Aug 2024 09:57:53 +0000 Subject: [PATCH 2/2] [Thread] format AIDL files Change-Id: Ic822710af1790a946bff838429cb98d2c6c3eef9 --- .../java/android/net/thread/ChannelMaxPower.aidl | 10 +++++----- .../net/thread/IOperationalDatasetCallback.aidl | 6 ++++-- .../android/net/thread/IThreadNetworkController.aidl | 12 +++++++----- .../android/net/thread/IThreadNetworkManager.aidl | 6 +++--- 4 files changed, 19 insertions(+), 15 deletions(-) diff --git a/thread/framework/java/android/net/thread/ChannelMaxPower.aidl b/thread/framework/java/android/net/thread/ChannelMaxPower.aidl index bcda8a8400..abc00b98ab 100644 --- a/thread/framework/java/android/net/thread/ChannelMaxPower.aidl +++ b/thread/framework/java/android/net/thread/ChannelMaxPower.aidl @@ -16,11 +16,11 @@ package android.net.thread; - /** - * Mapping from a channel to its max power. - * - * {@hide} - */ +/** + * Mapping from a channel to its max power. + * + * {@hide} + */ parcelable ChannelMaxPower { int channel; // The Thread radio channel. int maxPower; // The max power in the unit of 0.01dBm. Passing INT16_MAX(32767) will diff --git a/thread/framework/java/android/net/thread/IOperationalDatasetCallback.aidl b/thread/framework/java/android/net/thread/IOperationalDatasetCallback.aidl index b576b331ca..3fece65998 100644 --- a/thread/framework/java/android/net/thread/IOperationalDatasetCallback.aidl +++ b/thread/framework/java/android/net/thread/IOperationalDatasetCallback.aidl @@ -23,6 +23,8 @@ import android.net.thread.PendingOperationalDataset; * @hide */ oneway interface IOperationalDatasetCallback { - void onActiveOperationalDatasetChanged(in @nullable ActiveOperationalDataset activeOpDataset); - void onPendingOperationalDatasetChanged(in @nullable PendingOperationalDataset pendingOpDataset); + void onActiveOperationalDatasetChanged( + in @nullable ActiveOperationalDataset activeOpDataset); + void onPendingOperationalDatasetChanged( + in @nullable PendingOperationalDataset pendingOpDataset); } diff --git a/thread/framework/java/android/net/thread/IThreadNetworkController.aidl b/thread/framework/java/android/net/thread/IThreadNetworkController.aidl index f50de74561..b7f68c9950 100644 --- a/thread/framework/java/android/net/thread/IThreadNetworkController.aidl +++ b/thread/framework/java/android/net/thread/IThreadNetworkController.aidl @@ -28,9 +28,9 @@ import android.net.thread.PendingOperationalDataset; import android.net.thread.ThreadConfiguration; /** -* Interface for communicating with ThreadNetworkControllerService. -* @hide -*/ + * Interface for communicating with ThreadNetworkControllerService. + * @hide + */ interface IThreadNetworkController { void registerStateCallback(in IStateCallback callback); void unregisterStateCallback(in IStateCallback callback); @@ -38,10 +38,12 @@ interface IThreadNetworkController { void unregisterOperationalDatasetCallback(in IOperationalDatasetCallback callback); void join(in ActiveOperationalDataset activeOpDataset, in IOperationReceiver receiver); - void scheduleMigration(in PendingOperationalDataset pendingOpDataset, in IOperationReceiver receiver); + void scheduleMigration( + in PendingOperationalDataset pendingOpDataset, in IOperationReceiver receiver); void leave(in IOperationReceiver receiver); - void setTestNetworkAsUpstream(in String testNetworkInterfaceName, in IOperationReceiver receiver); + void setTestNetworkAsUpstream( + in String testNetworkInterfaceName, in IOperationReceiver receiver); void setChannelMaxPowers(in ChannelMaxPower[] channelMaxPowers, in IOperationReceiver receiver); int getThreadVersion(); diff --git a/thread/framework/java/android/net/thread/IThreadNetworkManager.aidl b/thread/framework/java/android/net/thread/IThreadNetworkManager.aidl index 0e394b1321..b63cd72d35 100644 --- a/thread/framework/java/android/net/thread/IThreadNetworkManager.aidl +++ b/thread/framework/java/android/net/thread/IThreadNetworkManager.aidl @@ -19,9 +19,9 @@ package android.net.thread; import android.net.thread.IThreadNetworkController; /** -* Interface for communicating with ThreadNetworkService. -* @hide -*/ + * Interface for communicating with ThreadNetworkService. + * @hide + */ interface IThreadNetworkManager { List getAllThreadNetworkControllers(); }