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

Merge "IpManager: always log immediate provisioning errors" am: 98f2decdad am: 2d2f66d277

Browse Source 
am: 834cf8d664

Change-Id: I39a5752827b02e9ebefa97b831b38da2eed4ca12
This commit is contained in:
Hugo Benichi
2017-06-26 12:12:20 +00:00
committed by android-build-merger
parent 88f06cba46 834cf8d664
commit 99979253dd
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -714,7 +714,6 @@ public class IpManager extends StateMachine {
return shouldLog; return shouldLog;
} }
// TODO: Migrate all Log.e(...) to logError(...).
private void logError(String fmt, Object... args) { private void logError(String fmt, Object... args) {
final String msg = "ERROR " + String.format(fmt, args); final String msg = "ERROR " + String.format(fmt, args);
Log.e(mTag, msg); Log.e(mTag, msg);
@@ -1035,7 +1034,7 @@ public class IpManager extends StateMachine {
} }
private void doImmediateProvisioningFailure(int failureType) { private void doImmediateProvisioningFailure(int failureType) {
if (DBG) { Log.e(mTag, "onProvisioningFailure(): " + failureType); } logError("onProvisioningFailure(): %s", failureType);
recordMetric(failureType); recordMetric(failureType);
mCallback.onProvisioningFailure(new LinkProperties(mLinkProperties)); mCallback.onProvisioningFailure(new LinkProperties(mLinkProperties));
} }
@@ -1170,7 +1169,7 @@ public class IpManager extends StateMachine {
case DhcpClient.CMD_ON_QUIT: case DhcpClient.CMD_ON_QUIT:
// Everything is already stopped. // Everything is already stopped.
Log.e(mTag, "Unexpected CMD_ON_QUIT (already stopped)."); logError("Unexpected CMD_ON_QUIT (already stopped).");
break; break;
default: default:
@@ -1376,7 +1375,7 @@ public class IpManager extends StateMachine {
break; break;
case CMD_START: case CMD_START:
Log.e(mTag, "ALERT: START received in StartedState. Please fix caller."); logError("ALERT: START received in StartedState. Please fix caller.");
break; break;
case CMD_CONFIRM: case CMD_CONFIRM:
@@ -1475,13 +1474,13 @@ public class IpManager extends StateMachine {
handleIPv4Failure(); handleIPv4Failure();
break; break;
default: default:
Log.e(mTag, "Unknown CMD_POST_DHCP_ACTION status:" + msg.arg1); logError("Unknown CMD_POST_DHCP_ACTION status: %s", msg.arg1);
} }
break; break;
case DhcpClient.CMD_ON_QUIT: case DhcpClient.CMD_ON_QUIT:
// DHCPv4 quit early for some reason. // DHCPv4 quit early for some reason.
Log.e(mTag, "Unexpected CMD_ON_QUIT."); logError("Unexpected CMD_ON_QUIT.");
mDhcpClient = null; mDhcpClient = null;
break; break;