diff options
| author | Patrick Rohr <prohr@google.com> | 2022-03-10 18:29:59 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-10 18:29:59 +0000 |
| commit | 9a2eb5ff2201dc2b1600cec28b9941a119270cd1 (patch) | |
| tree | c455ead9bc4cb42f0c22558d524b9c75ae703925 | |
| parent | c3974f3c529eae2ca838b3f97ce8bee6f69dc8f9 (diff) | |
| parent | 10937d6c2d9f8931940073911585fb2e4bd83950 (diff) | |
| download | ethernet-9a2eb5ff2201dc2b1600cec28b9941a119270cd1.tar.gz | |
Rename logIfEthernetNotStarted to throwIfEthernetNotStarted am: efe300c812 am: 797a0ca08f am: 7b1b68275e am: 10937d6c2d
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/2018415
Change-Id: If414942a114f4f742f52dc23c436a0b9a4dd3314
| -rw-r--r-- | java/com/android/server/ethernet/EthernetServiceImpl.java | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/java/com/android/server/ethernet/EthernetServiceImpl.java b/java/com/android/server/ethernet/EthernetServiceImpl.java index 782ee0f..89ac6e4 100644 --- a/java/com/android/server/ethernet/EthernetServiceImpl.java +++ b/java/com/android/server/ethernet/EthernetServiceImpl.java @@ -80,7 +80,7 @@ public class EthernetServiceImpl extends IEthernetManager.Stub { 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 @@ public class EthernetServiceImpl extends IEthernetManager.Stub { */ @Override public void setConfiguration(String iface, IpConfiguration config) { - logIfEthernetNotStarted(); + throwIfEthernetNotStarted(); PermissionUtils.enforceNetworkStackPermission(mContext); if (mTracker.isRestrictedInterface(iface)) { @@ -229,8 +229,7 @@ public class EthernetServiceImpl extends IEthernetManager.Stub { @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 @@ public class EthernetServiceImpl extends IEthernetManager.Stub { @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 @@ public class EthernetServiceImpl extends IEthernetManager.Stub { @Nullable final IEthernetNetworkManagementListener listener) { Log.i(TAG, "disconnectNetwork called with: iface=" + iface + ", listener=" + listener); Objects.requireNonNull(iface); - logIfEthernetNotStarted(); + throwIfEthernetNotStarted(); if (mTracker.isValidTestInterface(iface)) { enforceManageTestNetworksPermission(); |