Merge commit '61ce55899d92e786fb9595052e7dcc66e8148b4c' into manual_merge_61ce55899d92
Test: Build
Change-Id: I4e5ecc3b2540f07489d3b0dbcc0626d0e5f7d3da
diff --git a/services/core/java/com/android/server/NetworkManagementService.java b/services/core/java/com/android/server/NetworkManagementService.java
index f0e2d53..86c8909 100644
--- a/services/core/java/com/android/server/NetworkManagementService.java
+++ b/services/core/java/com/android/server/NetworkManagementService.java
@@ -154,7 +154,7 @@
*/
public static final String PERMISSION_SYSTEM = "SYSTEM";
- class NetdResponseCode {
+ static class NetdResponseCode {
/* Keep in sync with system/netd/server/ResponseCode.h */
public static final int InterfaceListResult = 110;
public static final int TetherInterfaceListResult = 111;
@@ -229,8 +229,8 @@
* If both locks need to be held, then they should be obtained in the order:
* first {@link #mQuotaLock} and then {@link #mRulesLock}.
*/
- private Object mQuotaLock = new Object();
- private Object mRulesLock = new Object();
+ private final Object mQuotaLock = new Object();
+ private final Object mRulesLock = new Object();
/** Set of interfaces with active quotas. */
@GuardedBy("mQuotaLock")
@@ -275,7 +275,7 @@
@GuardedBy("mQuotaLock")
private volatile boolean mDataSaverMode;
- private Object mIdleTimerLock = new Object();
+ private final Object mIdleTimerLock = new Object();
/** Set of interfaces with active idle timers. */
private static class IdleTimerParams {
public final int timeout;