Merge "Do not print misleading debug messages in some scenarios." into nyc-mr1-dev

2016-08-24 20:24:41 +00:00
parent 850912db88 bfd1d6ed49
commit edaaef304a
1 changed files with 5 additions and 1 deletions
--- a/core/java/android/net/NetworkIdentity.java
+++ b/core/java/android/net/NetworkIdentity.java
@@ -175,7 +175,11 @@ public class NetworkIdentity implements Comparable<NetworkIdentity> {

        if (isNetworkTypeMobile(type)) {
            if (state.subscriberId == null) {
-                Slog.w(TAG, "Active mobile network without subscriber!");
+                if (state.networkInfo.getState() != NetworkInfo.State.DISCONNECTED &&
+                        state.networkInfo.getState() != NetworkInfo.State.UNKNOWN) {
+                    Slog.w(TAG, "Active mobile network without subscriber! ni = "
+                            + state.networkInfo);
+                }
            }

            subscriberId = state.subscriberId;