Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix the data warning be -1 bug when data limit is disabled"

Browse Source
This commit is contained in:
Lei Yu
2016-08-17 20:42:00 +00:00
committed by Android (Google) Code Review
parent 6de29ed5b4 752a601d46
commit 257374cbc4
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SettingsLib/src/com/android/settingslib/NetworkPolicyEditor.java
View File

@@ -178,8 +178,9 @@ public class NetworkPolicyEditor {
public void setPolicyWarningBytes(NetworkTemplate template, long warningBytes) {
long limitBytes = getPolicyLimitBytes(template);
// If the warningBytes are larger than limitBytes, set the warningBytes to limitBytes
warningBytes = Math.min(warningBytes, limitBytes);
warningBytes =
(limitBytes == LIMIT_DISABLED) ? warningBytes : Math.min(warningBytes, limitBytes);
setPolicyWarningBytesInner(template, warningBytes);
}
@@ -192,8 +193,7 @@ public class NetworkPolicyEditor {
public void setPolicyLimitBytes(NetworkTemplate template, long limitBytes) {
long warningBytes = getPolicyWarningBytes(template);
// If the warningBytes are larger than limitBytes, set the warningBytes to limitBytes
if (warningBytes > limitBytes) {
if (warningBytes > limitBytes && limitBytes != LIMIT_DISABLED) {
setPolicyWarningBytesInner(template, limitBytes);
}