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

Merge "ethernet: rename IpClient callback handler functions" into main

Browse Source
This commit is contained in:
Maciej Żenczykowski
2023-08-24 22:30:04 +00:00
committed by Gerrit Code Review
parent a92d8cab5f d865e6d82d
commit b6b8041314
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
service-t/src/com/android/server/ethernet/EthernetNetworkFactory.java
View File

@@ -328,24 +328,24 @@ public class EthernetNetworkFactory {
@Override @Override
public void onProvisioningSuccess(LinkProperties newLp) { public void onProvisioningSuccess(LinkProperties newLp) {
safelyPostOnHandler(() -> onIpLayerStarted(newLp)); safelyPostOnHandler(() -> handleOnProvisioningSuccess(newLp));
} }
@Override @Override
public void onProvisioningFailure(LinkProperties newLp) { public void onProvisioningFailure(LinkProperties newLp) {
// This cannot happen due to provisioning timeout, because our timeout is 0. It can // This cannot happen due to provisioning timeout, because our timeout is 0. It can
// happen due to errors while provisioning or on provisioning loss. // happen due to errors while provisioning or on provisioning loss.
safelyPostOnHandler(() -> onIpLayerStopped()); safelyPostOnHandler(() -> handleOnProvisioningFailure());
} }
@Override @Override
public void onLinkPropertiesChange(LinkProperties newLp) { public void onLinkPropertiesChange(LinkProperties newLp) {
safelyPostOnHandler(() -> updateLinkProperties(newLp)); safelyPostOnHandler(() -> handleOnLinkPropertiesChange(newLp));
} }
@Override @Override
public void onReachabilityLost(String logMsg) { public void onReachabilityLost(String logMsg) {
safelyPostOnHandler(() -> updateNeighborLostEvent(logMsg)); safelyPostOnHandler(() -> handleOnReachabilityLost(logMsg));
} }
@Override @Override
@@ -499,7 +499,7 @@ public class EthernetNetworkFactory {
mIpClient.startProvisioning(createProvisioningConfiguration(mIpConfig)); mIpClient.startProvisioning(createProvisioningConfiguration(mIpConfig));
} }
void onIpLayerStarted(@NonNull final LinkProperties linkProperties) { private void handleOnProvisioningSuccess(@NonNull final LinkProperties linkProperties) {
if (mNetworkAgent != null) { if (mNetworkAgent != null) {
Log.e(TAG, "Already have a NetworkAgent - aborting new request"); Log.e(TAG, "Already have a NetworkAgent - aborting new request");
stop(); stop();
@@ -533,7 +533,7 @@ public class EthernetNetworkFactory {
mNetworkAgent.markConnected(); mNetworkAgent.markConnected();
} }
void onIpLayerStopped() { private void handleOnProvisioningFailure() {
// There is no point in continuing if the interface is gone as stop() will be triggered // There is no point in continuing if the interface is gone as stop() will be triggered
// by removeInterface() when processed on the handler thread and start() won't // by removeInterface() when processed on the handler thread and start() won't
// work for a non-existent interface. // work for a non-existent interface.
@@ -553,15 +553,15 @@ public class EthernetNetworkFactory {
} }
} }
void updateLinkProperties(LinkProperties linkProperties) { private void handleOnLinkPropertiesChange(LinkProperties linkProperties) {
mLinkProperties = linkProperties; mLinkProperties = linkProperties;
if (mNetworkAgent != null) { if (mNetworkAgent != null) {
mNetworkAgent.sendLinkPropertiesImpl(linkProperties); mNetworkAgent.sendLinkPropertiesImpl(linkProperties);
} }
} }
void updateNeighborLostEvent(String logMsg) { private void handleOnReachabilityLost(String logMsg) {
Log.i(TAG, "updateNeighborLostEvent " + logMsg); Log.i(TAG, "handleOnReachabilityLost " + logMsg);
if (mIpConfig.getIpAssignment() == IpAssignment.STATIC) { if (mIpConfig.getIpAssignment() == IpAssignment.STATIC) {
// Ignore NUD failures for static IP configurations, where restarting the IpClient // Ignore NUD failures for static IP configurations, where restarting the IpClient
// will not fix connectivity. // will not fix connectivity.