diff options
author | Lorenzo Colitti <lorenzo@google.com> | 2015-02-12 02:30:55 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-12 02:30:56 +0000 |
commit | c7ccc393b470220710f566d447412d93f7f8d21b (patch) | |
tree | 4e57c92a1cde82c68d478504fb9973510809fe61 /services | |
parent | 0ec652cf72bd8b7f619462f172ac0152d4d6c83d (diff) | |
parent | 0831f66f1949307bae54ccf01d70283005467085 (diff) | |
download | frameworks_base-c7ccc393b470220710f566d447412d93f7f8d21b.zip frameworks_base-c7ccc393b470220710f566d447412d93f7f8d21b.tar.gz frameworks_base-c7ccc393b470220710f566d447412d93f7f8d21b.tar.bz2 |
Merge "Make reportInetCondition revalidate if the report differs from our state" into lmp-mr1-dev
Diffstat (limited to 'services')
-rw-r--r-- | services/core/java/com/android/server/ConnectivityService.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 551a5dc..b72b29d 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -2636,9 +2636,15 @@ public class ConnectivityService extends IConnectivityManager.Stub // 100 percent is full good, 0 is full bad. public void reportInetCondition(int networkType, int percentage) { - if (percentage > 50) return; // don't handle good network reports NetworkAgentInfo nai = mLegacyTypeTracker.getNetworkForType(networkType); - if (nai != null) reportBadNetwork(nai.network); + if (nai == null) return; + boolean isGood = percentage > 50; + // Revalidate if the app report does not match our current validated state. + if (isGood != nai.lastValidated) { + // Make the message logged by reportBadNetwork below less confusing. + if (DBG && isGood) log("reportInetCondition: type=" + networkType + " ok, revalidate"); + reportBadNetwork(nai.network); + } } public void reportBadNetwork(Network network) { |