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

Merge "NetworkManagementService.java: fix error-prone warnings" am: 44b7e94a7c

Browse Source 
am: 0ba1fa19bd

Change-Id: Ia89fdb05890d40b1299c666a4535b4e9a8640323
This commit is contained in:
Andrew Scull
2017-05-23 10:47:09 +00:00
committed by android-build-merger
parent 85afabc4ec 0ba1fa19bd
commit 61ce55899d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/NetworkManagementService.java
View File

@@ -149,7 +149,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub
*/
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;
@@ -220,7 +220,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub
private final NetworkStatsFactory mStatsFactory = new NetworkStatsFactory();
private Object mQuotaLock = new Object();
private final Object mQuotaLock = new Object();
/** Set of interfaces with active quotas. */
@GuardedBy("mQuotaLock")
@@ -265,7 +265,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub
@GuardedBy("mQuotaLock")
private 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;