Merge "Revert "Revert "Call SurfaceControl.getBootDisplayModeSupport only one time""" into tm-dev (7e614634) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/display/LocalDisplayAdapter.java

+5 −3

Original line number	Diff line number	Diff line
		@@ -73,6 +73,8 @@ final class LocalDisplayAdapter extends DisplayAdapter {

		private final SurfaceControlProxy mSurfaceControlProxy;

		private final boolean mIsBootDisplayModeSupported;

		// Called with SyncRoot lock held.
		public LocalDisplayAdapter(DisplayManagerService.SyncRoot syncRoot,
		Context context, Handler handler, Listener listener) {
		@@ -85,6 +87,7 @@ final class LocalDisplayAdapter extends DisplayAdapter {
		super(syncRoot, context, handler, listener, TAG);
		mInjector = injector;
		mSurfaceControlProxy = mInjector.getSurfaceControlProxy();
		mIsBootDisplayModeSupported = mSurfaceControlProxy.getBootDisplayModeSupport();
		}

		@Override
		@@ -349,8 +352,7 @@ final class LocalDisplayAdapter extends DisplayAdapter {

		if (preferredRecord != null) {
		int preferredModeId = preferredRecord.mMode.getModeId();
		if (mSurfaceControlProxy.getBootDisplayModeSupport()
		&& mSystemPreferredModeId != preferredModeId) {
		if (mIsBootDisplayModeSupported && mSystemPreferredModeId != preferredModeId) {
		mSystemPreferredModeId = preferredModeId;
		preferredModeChanged = true;
		}
		@@ -900,7 +902,7 @@ final class LocalDisplayAdapter extends DisplayAdapter {
		}
		updateDeviceInfoLocked();

		if (!mSurfaceControlProxy.getBootDisplayModeSupport()) {
		if (!mIsBootDisplayModeSupported) {
		return;
		}
		if (mUserPreferredModeId == INVALID_MODE_ID) {