Merge "Change long to AtomicLong" into main (508b5dc6) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/satellite/SatelliteController.java

+118 −132

File changed.

Preview size limit exceeded, changes collapsed.

+5 −10

Original line number	Diff line number	Diff line
		@@ -232,6 +232,7 @@ import java.util.concurrent.Executor;
		import java.util.concurrent.Semaphore;
		import java.util.concurrent.TimeUnit;
		import java.util.concurrent.atomic.AtomicBoolean;
		import java.util.concurrent.atomic.AtomicInteger;
		import java.util.stream.Collectors;

		@RunWith(AndroidTestingRunner.class)
		@@ -6125,9 +6126,7 @@ public class SatelliteControllerTest extends TelephonyTest {
		@Override
		protected void setSelectedSatelliteSubId(int subId) {
		logd("setSelectedSatelliteSubId: subId=" + subId);
		synchronized (mSatelliteTokenProvisionedLock) {
		mSelectedSatelliteSubId = subId;
		}
		mSelectedSatelliteSubId = new AtomicInteger(subId);
		}

		@Override
		@@ -6257,16 +6256,12 @@ public class SatelliteControllerTest extends TelephonyTest {
		}

		public int getResultReceiverTotalCount() {
		synchronized (mResultReceiverTotalCountLock) {
		return mResultReceiverTotalCount;
		}
		return mResultReceiverTotalCount.get();
		}

		public HashMap<String, Integer> getResultReceiverCountPerMethodMap() {
		synchronized (mResultReceiverTotalCountLock) {
		public ConcurrentHashMap<String, Integer> getResultReceiverCountPerMethodMap() {
		return mResultReceiverCountPerMethodMap;
		}
		}

		public void setIsSatelliteAllowedState(boolean isAllowed) {
		mSatelliteAccessAllowed = new AtomicBoolean(isAllowed);