Merge "Ensure lock for unregisterActivityConfigurationListener" into main (bb3f3fe7) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/WindowProcessController.java

+6 −1

Original line number	Diff line number	Diff line
		@@ -1925,7 +1925,12 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio
		// showing.
		// If the configuration has been overridden by previous activity, empty it.
		mIsActivityConfigOverrideAllowed = false;
		// The call to `onServiceStarted` is not guarded with WM lock.
		mAtm.mH.post(() -> {
		synchronized (mAtm.mGlobalLock) {
		unregisterActivityConfigurationListener();
		}
		});
		break;
		default:
		break;