summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jack Yu <jackyu@google.com> 2016-08-24 20:54:08 +0000
committer android-build-merger <android-build-merger@google.com> 2016-08-24 20:54:08 +0000
commitcc2b91697f5ca00e8f280d8a3a1eeefec6c70b8e (patch)
treecbde8c746ba13f2c35eaeb846ac91bc34ee6403b
parent93556e80be284f6b8ee5e5fb221c0ad0e7cd5111 (diff)
parentd330f0ccc470d2bd8f397deb63cc74fc89f5cf40 (diff)
Do not print misleading debug messages in some scenarios. am: bfd1d6ed49
am: d330f0ccc4 Change-Id: Ia264715fe843b1b272da6ca909edc3be6fd57b28
-rw-r--r--core/java/android/net/NetworkIdentity.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/core/java/android/net/NetworkIdentity.java b/core/java/android/net/NetworkIdentity.java
index 9cd563e87c4a..d570e66a2435 100644
--- 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;