| commit | 24c27754c5f1d23dfa679ade368977936519a58d | [log] [tgz] |
|---|---|---|
| author | Svetoslav Ganov <svetoslavganov@google.com> | Wed Aug 31 18:09:00 2016 -0700 |
| committer | Svetoslav Ganov <svetoslavganov@google.com> | Wed Aug 31 18:09:00 2016 -0700 |
| tree | 83673d0c8ee4cf172ada6af5d68a2c47a0417c79 | |
| parent | 388d08b6e3f6eab30e90ac22b151862b3b4ab352 [diff] [blame] |
resolve merge conflicts of a2c1196 to master - continued Change-Id: I1b3c0e1a42b4cbb025de049e95d5377a162d58d1
diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java index 132c8e6..ed1d777 100644 --- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java +++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
@@ -282,7 +282,7 @@ private static final long TIME_CACHE_MAX_AGE = DAY_IN_MILLIS; -Mem private static final int MSG_RULES_CHANGED = 1; + private static final int MSG_RULES_CHANGED = 1; private static final int MSG_METERED_IFACES_CHANGED = 2; private static final int MSG_LIMIT_REACHED = 5; private static final int MSG_RESTRICT_BACKGROUND_CHANGED = 6;