Merge "Introduce LoggingOtStatusReceiver for logging results of IOtDaemon methods" into main am: 121724601d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3250572
Change-Id: I88f01754365e0068f9193ed79dd7e8d100db9dbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/thread/service/java/com/android/server/thread/ThreadNetworkControllerService.java b/thread/service/java/com/android/server/thread/ThreadNetworkControllerService.java
index 13817cf..6edaae9 100644
--- a/thread/service/java/com/android/server/thread/ThreadNetworkControllerService.java
+++ b/thread/service/java/com/android/server/thread/ThreadNetworkControllerService.java
@@ -1248,7 +1248,7 @@
.setInfraLinkState(
mInfraLinkState,
infraIcmp6Socket,
- new setInfraLinkStateStatusReceiver());
+ new LoggingOtStatusReceiver("setInfraLinkState"));
} catch (RemoteException | ThreadNetworkException e) {
LOG.e("Failed to configure border router " + mOtDaemonConfig, e);
}
@@ -1397,32 +1397,21 @@
}
}
- private static final class setOtDaemonConfigurationStatusReceiver
- extends IOtStatusReceiver.Stub {
- public setOtDaemonConfigurationStatusReceiver() {}
+ private static class LoggingOtStatusReceiver extends IOtStatusReceiver.Stub {
+ private final String mAction;
+
+ LoggingOtStatusReceiver(String action) {
+ mAction = action;
+ }
@Override
public void onSuccess() {
- LOG.i("Configured border router successfully");
+ LOG.i("The action " + mAction + " succeeded");
}
@Override
public void onError(int i, String s) {
- LOG.w(String.format("Failed to set configurations: %d %s", i, s));
- }
- }
-
- private static final class setInfraLinkStateStatusReceiver extends IOtStatusReceiver.Stub {
- public setInfraLinkStateStatusReceiver() {}
-
- @Override
- public void onSuccess() {
- LOG.i("Set the infra link state successfully");
- }
-
- @Override
- public void onError(int i, String s) {
- LOG.w(String.format("Failed to set the infra link state: %d %s", i, s));
+ LOG.w("The action " + mAction + " failed: " + i + " " + s);
}
}