commit 6a77e5d15bc20b776fb906fc3997ea50faff0d9f
author Patrick Rohr <prohr@google.com> Wed Mar 09 13:58:28 2022 +0100
committer Patrick Rohr <prohr@google.com> Wed Mar 09 14:05:48 2022 +0100
tree d056f65b9dcbc0294a3ddc28d83551f865f16e4b
parent 24fb1ef5b0ee92d641f5814ca4b515c1d74b0480

Rename logIfEthernetNotStarted to throwIfEthernetNotStarted

The functions does not log but throws an exception instead. Changing the
name to reflect that.

Test: TH
Change-Id: I6207aababaccc9bc553f7f731e3b8a1d26eb16a1

service-t/src/com/android/server/ethernet/EthernetServiceImpl.java

diff --git a/service-t/src/com/android/server/ethernet/EthernetServiceImpl.java b/service-t/src/com/android/server/ethernet/EthernetServiceImpl.java
index 782ee0f..89ac6e4 100644
--- a/service-t/src/com/android/server/ethernet/EthernetServiceImpl.java
+++ b/service-t/src/com/android/server/ethernet/EthernetServiceImpl.java
@@ -80,7 +80,7 @@
         mStarted.set(true);
     }
 
-    private void logIfEthernetNotStarted() {
+    private void throwIfEthernetNotStarted() {
         if (!mStarted.get()) {
             throw new IllegalStateException("System isn't ready to change ethernet configurations");
         }
@@ -111,7 +111,7 @@
      */
     @Override
     public void setConfiguration(String iface, IpConfiguration config) {
-        logIfEthernetNotStarted();
+        throwIfEthernetNotStarted();
 
         PermissionUtils.enforceNetworkStackPermission(mContext);
         if (mTracker.isRestrictedInterface(iface)) {
@@ -229,8 +229,7 @@
             @Nullable final IEthernetNetworkManagementListener listener) {
         Objects.requireNonNull(iface);
         Objects.requireNonNull(request);
-        // TODO: rename to throwIfEthernetNotStarted.
-        logIfEthernetNotStarted();
+        throwIfEthernetNotStarted();
 
         if (mTracker.isValidTestInterface(iface)) {
             enforceManageTestNetworksPermission();
@@ -255,7 +254,7 @@
             @Nullable final IEthernetNetworkManagementListener listener) {
         Log.i(TAG, "connectNetwork called with: iface=" + iface + ", listener=" + listener);
         Objects.requireNonNull(iface);
-        logIfEthernetNotStarted();
+        throwIfEthernetNotStarted();
 
         if (mTracker.isValidTestInterface(iface)) {
             enforceManageTestNetworksPermission();
@@ -273,7 +272,7 @@
             @Nullable final IEthernetNetworkManagementListener listener) {
         Log.i(TAG, "disconnectNetwork called with: iface=" + iface + ", listener=" + listener);
         Objects.requireNonNull(iface);
-        logIfEthernetNotStarted();
+        throwIfEthernetNotStarted();
 
         if (mTracker.isValidTestInterface(iface)) {
             enforceManageTestNetworksPermission();