diff options
| author | Alex Klyubin <klyubin@google.com> | 2016-12-22 19:01:13 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-12-22 19:01:13 +0000 |
| commit | b82465849450a54820758161fefe05cf61ea960f (patch) | |
| tree | ad71b3858ffc86341b71a35ffdfc517105e00da0 /core/java/android | |
| parent | 8dc64b729b3005660c06006a1f60b873d5181ccd (diff) | |
| parent | 5c53fdb89367481c2a65d7c8d188415c8e485131 (diff) | |
resolve merge conflicts of febd982 to stage-aosp-master
am: 5c53fdb893
Change-Id: Ib0878f0f17c3799ff9ffb92d7e85904fc91fdab7
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/net/NetworkPolicyManager.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/java/android/net/NetworkPolicyManager.java b/core/java/android/net/NetworkPolicyManager.java index 11b861aef5aa..22850b4bdb89 100644 --- a/core/java/android/net/NetworkPolicyManager.java +++ b/core/java/android/net/NetworkPolicyManager.java @@ -298,8 +298,11 @@ public class NetworkPolicyManager { cal.set(Calendar.MINUTE, 0); cal.set(Calendar.SECOND, 0); if (cycleDay > cal.getActualMaximum(Calendar.DAY_OF_MONTH)) { - cal.set(Calendar.DAY_OF_MONTH, 1); cal.add(Calendar.MONTH, 1); + cal.set(Calendar.DAY_OF_MONTH, 1); + cal.set(Calendar.HOUR_OF_DAY, 0); + cal.set(Calendar.MINUTE, 0); + cal.set(Calendar.SECOND, 0); cal.add(Calendar.SECOND, -1); } else { cal.set(Calendar.DAY_OF_MONTH, cycleDay); |