resolved conflicts for merge of 6d71af1f to mnc-vt-dev

Change-Id: Ib6418b64164c77fb1a8849af18da3c86e42a2730
2015-07-20 15:53:54 -07:00
parent 006a220097 6d71af1f53
commit 852a38e0d8
1 changed files with 5 additions and 0 deletions
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -1943,6 +1943,11 @@ public class ConnectivityService extends IConnectivityManager.Stub
                            Slog.wtf(TAG, "BUG: " + nai + " changed immutable capabilities: "
                                    + nai.networkCapabilities + " -> " + networkCapabilities);
                        }
+                        if (nai.created && !nai.networkCapabilities.equalImmutableCapabilities(
+                                networkCapabilities)) {
+                            Slog.wtf(TAG, "BUG: " + nai + " changed immutable capabilities: "
+                                    + nai.networkCapabilities + " -> " + networkCapabilities);
+                        }
                        updateCapabilities(nai, networkCapabilities);
                    }
                    break;