Merge "Reorder operations in ContextHubEndpointBroker#onHalRestart." into main (1ad82f5d) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/location/contexthub/ContextHubEndpointBroker.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -648,12 +648,6 @@ public class ContextHubEndpointBroker extends IContextHubEndpoint.Stub
		* @param hubInterface The new interface to the Context Hub HAL.
		*/
		/* package */ void onHalRestart(@NonNull IEndpointCommunication hubInterface) {
		synchronized (mOpenSessionLock) {
		for (int i = mSessionMap.size() - 1; i >= 0; i--) {
		int id = mSessionMap.keyAt(i);
		onCloseEndpointSession(id, Reason.HUB_RESET);
		}
		}
		synchronized (mRegistrationLock) {
		if (mIsRegistered) {
		mIsRegistered = false;
		@@ -665,6 +659,12 @@ public class ContextHubEndpointBroker extends IContextHubEndpoint.Stub
		}
		}
		}
		synchronized (mOpenSessionLock) {
		for (int i = mSessionMap.size() - 1; i >= 0; i--) {
		int id = mSessionMap.keyAt(i);
		onCloseEndpointSession(id, Reason.HUB_RESET);
		}
		}
		}

		/* package */ Optional<Byte> onEndpointSessionOpenRequest(