Merge "Check if the display is attached when updating config" (3bf738ed) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/ActivityManagerService.java

+10 −1

Original line number	Diff line number	Diff line
		@@ -21,7 +21,6 @@ import android.app.ApplicationThreadConstants;
		import android.app.ContentProviderHolder;
		import android.app.IActivityManager;
		import android.app.WaitResult;
		import android.graphics.PointF;
		import android.os.IDeviceIdentifiersPolicyService;

		import com.android.internal.policy.IKeyguardDismissCallback;
		@@ -19114,6 +19113,16 @@ public class ActivityManagerService extends IActivityManager.Stub
		enforceCallingPermission(CHANGE_CONFIGURATION, "updateDisplayOverrideConfiguration()");

		synchronized (this) {
		// Check if display is initialized in AM.
		if (!mStackSupervisor.isDisplayAdded(displayId)) {
		// Call might come when display is not yet added or has already been removed.
		if (DEBUG_CONFIGURATION) {
		Slog.w(TAG, "Trying to update display configuration for non-existing displayId="
		+ displayId);
		}
		return false;
		}

		if (values == null && mWindowManager != null) {
		// sentinel: fetch the current configuration from the window manager
		values = mWindowManager.computeNewConfiguration(displayId);

+5 −0

Original line number	Diff line number	Diff line
		@@ -3561,6 +3561,11 @@ public class ActivityStackSupervisor extends ConfigurationContainer
		}
		}

		/** Check if display with specified id is added to the list. */
		boolean isDisplayAdded(int displayId) {
		return mActivityDisplays.get(displayId) != null;
		}

		private void calculateDefaultMinimalSizeOfResizeableTasks(ActivityDisplay display) {
		mDefaultMinSizeOfResizeableTask =
		mService.mContext.getResources().getDimensionPixelSize(

+10 −1

Original line number	Diff line number	Diff line
		@@ -214,6 +214,7 @@ import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_ADD_REMOVE;
		import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_ANIM;
		import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_APP_TRANSITIONS;
		import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_BOOT;
		import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_CONFIGURATION;
		import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_DRAG;
		import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_FOCUS;
		import static com.android.server.wm.WindowManagerDebugConfig.DEBUG_FOCUS_LIGHT;
		@@ -6470,7 +6471,15 @@ public class WindowManagerService extends IWindowManager.Stub
		case SEND_NEW_CONFIGURATION: {
		removeMessages(SEND_NEW_CONFIGURATION, msg.obj);
		final int displayId = (Integer) msg.obj;
		if (mRoot.getDisplayContent(displayId) != null) {
		sendNewConfiguration(displayId);
		} else {
		// Message could come after display has already been removed.
		if (DEBUG_CONFIGURATION) {
		Slog.w(TAG, "Trying to send configuration to non-existing displayId="
		+ displayId);
		}
		}
		break;
		}