Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96320f6a authored by Fan Zhang's avatar Fan Zhang Committed by android-build-merger
Browse files

Parse -1 as WARNING_DISABLED in NetworkPolicyManager. 

am: da71ca08

Change-Id: I148f7edb93a29e5e8f0c26693b5b21a744c18797
parents 59aa0274 da71ca08

services/core/java/com/android/server/net/NetworkPolicyManagerService.java

+8 −2
Original line number Diff line number Diff line
@@ -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();