summaryrefslogtreecommitdiffstats
path: root/services/core/java/com/android/server/net
diff options
context:
space:
mode:
authorAdnan <adnan@cyngn.com>2015-03-02 13:35:38 -0800
committerSteve Kondik <steve@cyngn.com>2015-10-26 16:09:12 -0700
commitc078f3b985a012bcc6c4776a50ad179775f1ba2e (patch)
tree6f6541f7f5dd831e0643d5fc05873668bd0d3ed5 /services/core/java/com/android/server/net
parent3952cea8b275ff8e958b022aa995ba12d733d13a (diff)
downloadframeworks_base-c078f3b985a012bcc6c4776a50ad179775f1ba2e.zip
frameworks_base-c078f3b985a012bcc6c4776a50ad179775f1ba2e.tar.gz
frameworks_base-c078f3b985a012bcc6c4776a50ad179775f1ba2e.tar.bz2
NetworkPolicyManager: Don't show warning notification on disabled.
JIRA: TOMATOL-148 Change-Id: I61796b1f1ad0c19d85a634f13ae0d6019ccffbb8
Diffstat (limited to 'services/core/java/com/android/server/net')
-rw-r--r--services/core/java/com/android/server/net/NetworkPolicyManagerService.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
index 522ec48..f041f0d 100644
--- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
+++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
@@ -804,7 +804,8 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
} else {
notifyUnderLimitLocked(policy.template);
- if (policy.isOverWarning(totalBytes) && policy.lastWarningSnooze < start) {
+ if (policy.isOverWarning(totalBytes) && policy.lastWarningSnooze < start
+ && policy.limitBytes != LIMIT_DISABLED) {
enqueueNotification(policy, TYPE_WARNING, totalBytes);
}
}