Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use IpManager.ifname as the tag in log messages. am: ef1f39abff

Browse Source 
am: 16e1e55271

* commit '16e1e55271ba33f980432612c561f877d3fefe8b':
  Use IpManager.ifname as the tag in log messages.
This commit is contained in:
Erik Kline
2016-02-11 13:30:15 +00:00
committed by android-build-merger
parent f61588ebee 16e1e55271
commit 47bc406d7b
1 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
services/net/java/android/net/ip/IpManager.java
View File

@@ -61,7 +61,6 @@ import java.util.Objects;
* @hide * @hide
*/ */
public class IpManager extends StateMachine { public class IpManager extends StateMachine {
private static final String TAG = IpManager.class.getSimpleName();
private static final boolean DBG = true; private static final boolean DBG = true;
private static final boolean VDBG = false; private static final boolean VDBG = false;
@@ -130,6 +129,7 @@ public class IpManager extends StateMachine {
private final State mStoppingState = new StoppingState(); private final State mStoppingState = new StoppingState();
private final State mStartedState = new StartedState(); private final State mStartedState = new StartedState();
private final String mTag;
private final Context mContext; private final Context mContext;
private final String mInterfaceName; private final String mInterfaceName;
@VisibleForTesting @VisibleForTesting
@@ -156,11 +156,11 @@ public class IpManager extends StateMachine {
public IpManager(Context context, String ifName, Callback callback) public IpManager(Context context, String ifName, Callback callback)
throws IllegalArgumentException { throws IllegalArgumentException {
super(TAG + "." + ifName); super(IpManager.class.getSimpleName() + "." + ifName);
mTag = getName();
mContext = context; mContext = context;
mInterfaceName = ifName; mInterfaceName = ifName;
mCallback = callback; mCallback = callback;
mNwService = INetworkManagementService.Stub.asInterface( mNwService = INetworkManagementService.Stub.asInterface(
@@ -177,7 +177,7 @@ public class IpManager extends StateMachine {
try { try {
mNwService.registerObserver(mNetlinkTracker); mNwService.registerObserver(mNetlinkTracker);
} catch (RemoteException e) { } catch (RemoteException e) {
Log.e(TAG, "Couldn't register NetlinkTracker: " + e.toString()); Log.e(mTag, "Couldn't register NetlinkTracker: " + e.toString());
} }
resetLinkProperties(); resetLinkProperties();
@@ -200,7 +200,9 @@ public class IpManager extends StateMachine {
*/ */
@VisibleForTesting @VisibleForTesting
protected IpManager(String ifName, Callback callback) { protected IpManager(String ifName, Callback callback) {
super(TAG + ".test-" + ifName); super(IpManager.class.getSimpleName() + ".test-" + ifName);
mTag = getName();
mInterfaceName = ifName; mInterfaceName = ifName;
mCallback = callback; mCallback = callback;
@@ -273,7 +275,7 @@ public class IpManager extends StateMachine {
mInterfaceName, mInterfaceIndex, mInterfaceName, mInterfaceIndex,
msg.arg1, msg.arg2, Objects.toString(msg.obj)); msg.arg1, msg.arg2, Objects.toString(msg.obj));
if (VDBG) { if (VDBG) {
Log.d(TAG, getWhatToString(msg.what) + " " + logLine); Log.d(mTag, getWhatToString(msg.what) + " " + logLine);
} }
return logLine; return logLine;
} }
@@ -283,7 +285,7 @@ public class IpManager extends StateMachine {
mInterfaceIndex = NetworkInterface.getByName(mInterfaceName).getIndex(); mInterfaceIndex = NetworkInterface.getByName(mInterfaceName).getIndex();
} catch (SocketException | NullPointerException e) { } catch (SocketException | NullPointerException e) {
// TODO: throw new IllegalStateException. // TODO: throw new IllegalStateException.
Log.e(TAG, "ALERT: Failed to get interface index: ", e); Log.e(mTag, "ALERT: Failed to get interface index: ", e);
} }
} }
@@ -365,17 +367,17 @@ public class IpManager extends StateMachine {
private void dispatchCallback(ProvisioningChange delta, LinkProperties newLp) { private void dispatchCallback(ProvisioningChange delta, LinkProperties newLp) {
switch (delta) { switch (delta) {
case GAINED_PROVISIONING: case GAINED_PROVISIONING:
if (VDBG) { Log.d(TAG, "onProvisioningSuccess()"); } if (VDBG) { Log.d(mTag, "onProvisioningSuccess()"); }
mCallback.onProvisioningSuccess(newLp); mCallback.onProvisioningSuccess(newLp);
break; break;
case LOST_PROVISIONING: case LOST_PROVISIONING:
if (VDBG) { Log.d(TAG, "onProvisioningFailure()"); } if (VDBG) { Log.d(mTag, "onProvisioningFailure()"); }
mCallback.onProvisioningFailure(newLp); mCallback.onProvisioningFailure(newLp);
break; break;
default: default:
if (VDBG) { Log.d(TAG, "onLinkPropertiesChange()"); } if (VDBG) { Log.d(mTag, "onLinkPropertiesChange()"); }
mCallback.onLinkPropertiesChange(newLp); mCallback.onLinkPropertiesChange(newLp);
break; break;
} }
@@ -396,7 +398,7 @@ public class IpManager extends StateMachine {
switch (delta) { switch (delta) {
case GAINED_PROVISIONING: case GAINED_PROVISIONING:
case LOST_PROVISIONING: case LOST_PROVISIONING:
Log.d(TAG, "provisioning: " + delta); Log.d(mTag, "provisioning: " + delta);
break; break;
} }
} }
@@ -452,7 +454,7 @@ public class IpManager extends StateMachine {
} }
if (VDBG) { if (VDBG) {
Log.d(TAG, "newLp{" + newLp + "}"); Log.d(mTag, "newLp{" + newLp + "}");
} }
return newLp; return newLp;
@@ -464,7 +466,7 @@ public class IpManager extends StateMachine {
ifcg.setLinkAddress(new LinkAddress("0.0.0.0/0")); ifcg.setLinkAddress(new LinkAddress("0.0.0.0/0"));
mNwService.setInterfaceConfig(mInterfaceName, ifcg); mNwService.setInterfaceConfig(mInterfaceName, ifcg);
} catch (RemoteException e) { } catch (RemoteException e) {
Log.e(TAG, "ALERT: Failed to clear IPv4 address on interface " + mInterfaceName, e); Log.e(mTag, "ALERT: Failed to clear IPv4 address on interface " + mInterfaceName, e);
} }
} }
@@ -474,7 +476,7 @@ public class IpManager extends StateMachine {
final ProvisioningChange delta = setLinkProperties(newLp); final ProvisioningChange delta = setLinkProperties(newLp);
if (VDBG) { if (VDBG) {
Log.d(TAG, "onNewDhcpResults(" + Objects.toString(dhcpResults) + ")"); Log.d(mTag, "onNewDhcpResults(" + Objects.toString(dhcpResults) + ")");
} }
mCallback.onNewDhcpResults(dhcpResults); mCallback.onNewDhcpResults(dhcpResults);
@@ -502,7 +504,7 @@ public class IpManager extends StateMachine {
delta = ProvisioningChange.LOST_PROVISIONING; delta = ProvisioningChange.LOST_PROVISIONING;
} }
if (VDBG) { Log.d(TAG, "onNewDhcpResults(null)"); } if (VDBG) { Log.d(mTag, "onNewDhcpResults(null)"); }
mCallback.onNewDhcpResults(null); mCallback.onNewDhcpResults(null);
dispatchCallback(delta, newLp); dispatchCallback(delta, newLp);
@@ -518,7 +520,7 @@ public class IpManager extends StateMachine {
mNwService.disableIpv6(mInterfaceName); mNwService.disableIpv6(mInterfaceName);
mNwService.clearInterfaceAddresses(mInterfaceName); mNwService.clearInterfaceAddresses(mInterfaceName);
} catch (Exception e) { } catch (Exception e) {
Log.e(TAG, "Failed to clear addresses or disable IPv6" + e); Log.e(mTag, "Failed to clear addresses or disable IPv6" + e);
} }
resetLinkProperties(); resetLinkProperties();
@@ -541,7 +543,7 @@ public class IpManager extends StateMachine {
case DhcpStateMachine.CMD_ON_QUIT: case DhcpStateMachine.CMD_ON_QUIT:
// Everything is already stopped. // Everything is already stopped.
Log.e(TAG, "Unexpected CMD_ON_QUIT (already stopped)."); Log.e(mTag, "Unexpected CMD_ON_QUIT (already stopped).");
break; break;
default: default:
@@ -584,9 +586,9 @@ public class IpManager extends StateMachine {
mNwService.enableIpv6(mInterfaceName); mNwService.enableIpv6(mInterfaceName);
// TODO: Perhaps clearIPv4Address() as well. // TODO: Perhaps clearIPv4Address() as well.
} catch (RemoteException re) { } catch (RemoteException re) {
Log.e(TAG, "Unable to change interface settings: " + re); Log.e(mTag, "Unable to change interface settings: " + re);
} catch (IllegalStateException ie) { } catch (IllegalStateException ie) {
Log.e(TAG, "Unable to change interface settings: " + ie); Log.e(mTag, "Unable to change interface settings: " + ie);
} }
mIpReachabilityMonitor = new IpReachabilityMonitor( mIpReachabilityMonitor = new IpReachabilityMonitor(
@@ -607,7 +609,7 @@ public class IpManager extends StateMachine {
if (applyStaticIpConfig()) { if (applyStaticIpConfig()) {
handleIPv4Success(new DhcpResults(mStaticIpConfig)); handleIPv4Success(new DhcpResults(mStaticIpConfig));
} else { } else {
if (VDBG) { Log.d(TAG, "onProvisioningFailure()"); } if (VDBG) { Log.d(mTag, "onProvisioningFailure()"); }
mCallback.onProvisioningFailure(getLinkProperties()); mCallback.onProvisioningFailure(getLinkProperties());
transitionTo(mStoppingState); transitionTo(mStoppingState);
} }
@@ -640,7 +642,7 @@ public class IpManager extends StateMachine {
break; break;
case CMD_START: case CMD_START:
Log.e(TAG, "ALERT: START received in StartedState. Please fix caller."); Log.e(mTag, "ALERT: START received in StartedState. Please fix caller.");
break; break;
case CMD_CONFIRM: case CMD_CONFIRM:
@@ -677,7 +679,7 @@ public class IpManager extends StateMachine {
} }
case DhcpStateMachine.CMD_PRE_DHCP_ACTION: case DhcpStateMachine.CMD_PRE_DHCP_ACTION:
if (VDBG) { Log.d(TAG, "onPreDhcpAction()"); } if (VDBG) { Log.d(mTag, "onPreDhcpAction()"); }
mCallback.onPreDhcpAction(); mCallback.onPreDhcpAction();
break; break;
@@ -685,7 +687,7 @@ public class IpManager extends StateMachine {
// Note that onPostDhcpAction() is likely to be // Note that onPostDhcpAction() is likely to be
// asynchronous, and thus there is no guarantee that we // asynchronous, and thus there is no guarantee that we
// will be able to observe any of its effects here. // will be able to observe any of its effects here.
if (VDBG) { Log.d(TAG, "onPostDhcpAction()"); } if (VDBG) { Log.d(mTag, "onPostDhcpAction()"); }
mCallback.onPostDhcpAction(); mCallback.onPostDhcpAction();
final DhcpResults dhcpResults = (DhcpResults) msg.obj; final DhcpResults dhcpResults = (DhcpResults) msg.obj;
@@ -697,14 +699,14 @@ public class IpManager extends StateMachine {
handleIPv4Failure(); handleIPv4Failure();
break; break;
default: default:
Log.e(TAG, "Unknown CMD_POST_DHCP_ACTION status:" + msg.arg1); Log.e(mTag, "Unknown CMD_POST_DHCP_ACTION status:" + msg.arg1);
} }
break; break;
} }
case DhcpStateMachine.CMD_ON_QUIT: case DhcpStateMachine.CMD_ON_QUIT:
// DHCPv4 quit early for some reason. // DHCPv4 quit early for some reason.
Log.e(TAG, "Unexpected CMD_ON_QUIT."); Log.e(mTag, "Unexpected CMD_ON_QUIT.");
mDhcpStateMachine = null; mDhcpStateMachine = null;
break; break;
@@ -720,9 +722,9 @@ public class IpManager extends StateMachine {
ifcg.setInterfaceUp(); ifcg.setInterfaceUp();
try { try {
mNwService.setInterfaceConfig(mInterfaceName, ifcg); mNwService.setInterfaceConfig(mInterfaceName, ifcg);
if (DBG) Log.d(TAG, "Static IP configuration succeeded"); if (DBG) Log.d(mTag, "Static IP configuration succeeded");
} catch (IllegalStateException | RemoteException e) { } catch (IllegalStateException | RemoteException e) {
Log.e(TAG, "Static IP configuration failed: ", e); Log.e(mTag, "Static IP configuration failed: ", e);
return false; return false;
} }