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

Parse -1 as WARNING_DISABLED in NetworkPolicyManager.

Browse Source 
Bug: 26934313
Bug: 31437693
Test: Flashed phone with new config (-1) and verified data warning is
disabled out of box.
Change-Id: Iabdfb9d0625698d525d7537a93b936df505bd0ab
This commit is contained in:
Fan Zhang
2016-09-12 17:36:22 -07:00
parent 3304f950bd
commit da71ca08ef
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/net/NetworkPolicyManagerService.java
View File

@@ -1442,8 +1442,14 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
+ "; generating default policy");
// Build default mobile policy, and assume usage cycle starts today
final long warningBytes = mContext.getResources().getInteger(
com.android.internal.R.integer.config_networkPolicyDefaultWarning) * MB_IN_BYTES;
final int dataWarningConfig = mContext.getResources().getInteger(
com.android.internal.R.integer.config_networkPolicyDefaultWarning);
final long warningBytes;
if (dataWarningConfig == WARNING_DISABLED) {
warningBytes = WARNING_DISABLED;
} else {
warningBytes = dataWarningConfig * MB_IN_BYTES;
}
final Time time = new Time();
time.setToNow();