Merge "CommonTimeManagementService: fix error-prone warnings." (d5ff58d0) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/CommonTimeManagementService.java

+8 −12

Original line number	Diff line number	Diff line
		@@ -92,12 +92,12 @@ class CommonTimeManagementService extends Binder {
		* Internal state
		*/
		private final Context mContext;
		private final Object mLock = new Object();
		private INetworkManagementService mNetMgr;
		private CommonTimeConfig mCTConfig;
		private String mCurIface;
		private Handler mReconnectHandler = new Handler();
		private Handler mNoInterfaceHandler = new Handler();
		private Object mLock = new Object();
		private boolean mDetectedAtStartup = false;
		private byte mEffectivePrio = BASE_SERVER_PRIO;

		@@ -105,15 +105,19 @@ class CommonTimeManagementService extends Binder {
		* Callback handler implementations.
		*/
		private INetworkManagementEventObserver mIfaceObserver = new BaseNetworkObserver() {
		@Override
		public void interfaceStatusChanged(String iface, boolean up) {
		reevaluateServiceState();
		}
		@Override
		public void interfaceLinkStateChanged(String iface, boolean up) {
		reevaluateServiceState();
		}
		@Override
		public void interfaceAdded(String iface) {
		reevaluateServiceState();
		}
		@Override
		public void interfaceRemoved(String iface) {
		reevaluateServiceState();
		}
		@@ -127,19 +131,11 @@ class CommonTimeManagementService extends Binder {
		};

		private CommonTimeConfig.OnServerDiedListener mCTServerDiedListener =
		new CommonTimeConfig.OnServerDiedListener() {
		public void onServerDied() {
		scheduleTimeConfigReconnect();
		}
		};
		() -> scheduleTimeConfigReconnect();

		private Runnable mReconnectRunnable = new Runnable() {
		public void run() { connectToTimeConfig(); }
		};
		private Runnable mReconnectRunnable = () -> connectToTimeConfig();

		private Runnable mNoInterfaceRunnable = new Runnable() {
		public void run() { handleNoInterfaceTimeout(); }
		};
		private Runnable mNoInterfaceRunnable = () -> handleNoInterfaceTimeout();

		/*
		* Public interface (constructor, systemReady and dump)