summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Qiu <zqiu@google.com>2016-01-28 17:09:52 +0000
committerAndroid Partner Code Review <android-gerrit-partner@google.com>2016-01-28 17:09:52 +0000
commit27d23f166b1f33e4991cf56ca20bfe382dfcb408 (patch)
treed09190447d58c85ac9bf90284e6858b6f27b9f2b
parent8541f6411048c5c6281699153b8c7c73e1f30c4c (diff)
parentbf54d3375aea13eb0147dbea8a03933b5e83fe3e (diff)
Merge "Correctly log old/new link properties when IP provisioning is lost" into mm-wireless-dev
-rw-r--r--service/java/com/android/server/wifi/WifiStateMachine.java12
1 files changed, 6 insertions, 6 deletions
diff --git a/service/java/com/android/server/wifi/WifiStateMachine.java b/service/java/com/android/server/wifi/WifiStateMachine.java
index ec4d815d6..ab015213d 100644
--- a/service/java/com/android/server/wifi/WifiStateMachine.java
+++ b/service/java/com/android/server/wifi/WifiStateMachine.java
@@ -4488,6 +4488,12 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno
(mLinkProperties.isIPv6Provisioned() && !newLp.isIPv6Provisioned());
final DetailedState detailedState = getNetworkDetailedState();
+ if (lostProvisioning) {
+ log("Lost IP layer provisioning!" +
+ " was: " + mLinkProperties +
+ " now: " + newLp);
+ }
+
if (linkChanged) {
if (DBG) {
log("Link configuration changed for netId: " + mLastNetworkId
@@ -4500,12 +4506,6 @@ public class WifiStateMachine extends StateMachine implements WifiNative.WifiPno
if (mNetworkAgent != null) mNetworkAgent.sendLinkProperties(mLinkProperties);
}
- if (lostProvisioning) {
- log("Lost IP layer provisioning!" +
- " was: " + mLinkProperties +
- " now: " + newLp);
- }
-
if (DBG) {
StringBuilder sb = new StringBuilder();
sb.append("updateLinkProperties nid: " + mLastNetworkId);