LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename logIfEthernetNotStarted to throwIfEthernetNotStarted

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

Test: TH
Change-Id: I6207aababaccc9bc553f7f731e3b8a1d26eb16a1
This commit is contained in:
Patrick Rohr
2022-03-09 13:58:28 +01:00
parent 24fb1ef5b0
commit 6a77e5d15b
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -80,7 +80,7 @@ public class EthernetServiceImpl extends IEthernetManager.Stub {
mStarted.set(true); mStarted.set(true);
} }
private void logIfEthernetNotStarted() { private void throwIfEthernetNotStarted() {
if (!mStarted.get()) { if (!mStarted.get()) {
throw new IllegalStateException("System isn't ready to change ethernet configurations"); throw new IllegalStateException("System isn't ready to change ethernet configurations");
} }
@@ -111,7 +111,7 @@ public class EthernetServiceImpl extends IEthernetManager.Stub {
*/ */
@Override @Override
public void setConfiguration(String iface, IpConfiguration config) { public void setConfiguration(String iface, IpConfiguration config) {
logIfEthernetNotStarted(); throwIfEthernetNotStarted();
PermissionUtils.enforceNetworkStackPermission(mContext); PermissionUtils.enforceNetworkStackPermission(mContext);
if (mTracker.isRestrictedInterface(iface)) { if (mTracker.isRestrictedInterface(iface)) {
@@ -229,8 +229,7 @@ public class EthernetServiceImpl extends IEthernetManager.Stub {
@Nullable final IEthernetNetworkManagementListener listener) { @Nullable final IEthernetNetworkManagementListener listener) {
Objects.requireNonNull(iface); Objects.requireNonNull(iface);
Objects.requireNonNull(request); Objects.requireNonNull(request);
// TODO: rename to throwIfEthernetNotStarted. throwIfEthernetNotStarted();
logIfEthernetNotStarted();
if (mTracker.isValidTestInterface(iface)) { if (mTracker.isValidTestInterface(iface)) {
enforceManageTestNetworksPermission(); enforceManageTestNetworksPermission();
@@ -255,7 +254,7 @@ public class EthernetServiceImpl extends IEthernetManager.Stub {
@Nullable final IEthernetNetworkManagementListener listener) { @Nullable final IEthernetNetworkManagementListener listener) {
Log.i(TAG, "connectNetwork called with: iface=" + iface + ", listener=" + listener); Log.i(TAG, "connectNetwork called with: iface=" + iface + ", listener=" + listener);
Objects.requireNonNull(iface); Objects.requireNonNull(iface);
logIfEthernetNotStarted(); throwIfEthernetNotStarted();
if (mTracker.isValidTestInterface(iface)) { if (mTracker.isValidTestInterface(iface)) {
enforceManageTestNetworksPermission(); enforceManageTestNetworksPermission();
@@ -273,7 +272,7 @@ public class EthernetServiceImpl extends IEthernetManager.Stub {
@Nullable final IEthernetNetworkManagementListener listener) { @Nullable final IEthernetNetworkManagementListener listener) {
Log.i(TAG, "disconnectNetwork called with: iface=" + iface + ", listener=" + listener); Log.i(TAG, "disconnectNetwork called with: iface=" + iface + ", listener=" + listener);
Objects.requireNonNull(iface); Objects.requireNonNull(iface);
logIfEthernetNotStarted(); throwIfEthernetNotStarted();
if (mTracker.isValidTestInterface(iface)) { if (mTracker.isValidTestInterface(iface)) {
enforceManageTestNetworksPermission(); enforceManageTestNetworksPermission();