Merge "Fix race+logging issue in SystemStateHelper" into sc-dev (bb766995) · Commits · e / os / android_packages_services_Telecomm

src/com/android/server/telecom/SystemStateHelper.java

+13 −5

Original line number	Diff line number	Diff line
		@@ -75,7 +75,7 @@ public class SystemStateHelper implements UiModeManager.OnProjectionStateChangeL
		private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
		@Override
		public void onReceive(Context context, Intent intent) {
		Log.startSession("SSP.oR");
		Log.startSession("SSH.oR");
		try {
		synchronized (mLock) {
		String action = intent.getAction();
		@@ -120,12 +120,20 @@ public class SystemStateHelper implements UiModeManager.OnProjectionStateChangeL
		@Override
		public void onProjectionStateChanged(int activeProjectionTypes,
		@NonNull Set<String> projectingPackages) {
		Log.startSession("SSH.oPSC");
		try {
		synchronized (mLock) {
		if (projectingPackages.isEmpty()) {
		onReleaseAutomotiveProjection();
		} else {
		onSetAutomotiveProjection(projectingPackages.iterator().next());
		}
		}
		} finally {
		Log.endSession();
		}

		}

		private Set<SystemStateListener> mListeners = new CopyOnWriteArraySet<>();
		private boolean mIsCarModeOrProjectionActive;