Merge "Revert "Added display initialization method"" into jb-mr1-dev (bc46e0ad) · Commits · e / devices / smdk4412 / android_frameworks_native

services/surfaceflinger/SurfaceFlinger.cpp

+9 −35

Original line number	Diff line number	Diff line
		@@ -137,8 +137,15 @@ void SurfaceFlinger::binderDied(const wp<IBinder>& who)
		{
		// the window manager died on us. prepare its eulogy.

		// restore initial conditions (default device unblank, etc)
		initializeDisplays();
		// reset screen orientation
		Vector<ComposerState> state;
		Vector<DisplayState> displays;
		DisplayState d;
		d.what = DisplayState::eOrientationChanged;
		d.token = mDefaultDisplays[DisplayDevice::DISPLAY_ID_MAIN];
		d.orientation = DisplayState::eOrientationDefault;
		displays.add(d);
		setTransactionState(state, displays, 0);

		// restart the boot-animation
		startBootAnim();
		@@ -424,9 +431,6 @@ status_t SurfaceFlinger::readyToRun()
		// We're now ready to accept clients...
		mReadyToRunBarrier.open();

		// set initial conditions (e.g. unblank default device)
		initializeDisplays();

		// start boot animation
		startBootAnim();

		@@ -1697,36 +1701,6 @@ status_t SurfaceFlinger::onLayerDestroyed(const wp<LayerBaseClient>& layer)

		// ---------------------------------------------------------------------------

		void SurfaceFlinger::onInitializeDisplays() {
		// reset screen orientation
		Vector<ComposerState> state;
		Vector<DisplayState> displays;
		DisplayState d;
		d.what = DisplayState::eOrientationChanged;
		d.token = mDefaultDisplays[DisplayDevice::DISPLAY_ID_MAIN];
		d.orientation = DisplayState::eOrientationDefault;
		displays.add(d);
		setTransactionState(state, displays, 0);

		// XXX: this should init default device to "unblank" and all other devices to "blank"
		onScreenAcquired();
		}

		void SurfaceFlinger::initializeDisplays() {
		class MessageScreenInitialized : public MessageBase {
		SurfaceFlinger* flinger;
		public:
		MessageScreenInitialized(SurfaceFlinger* flinger) : flinger(flinger) { }
		virtual bool handler() {
		flinger->onInitializeDisplays();
		return true;
		}
		};
		sp<MessageBase> msg = new MessageScreenInitialized(this);
		postMessageAsync(msg); // we may be called from main thread, use async message
		}


		void SurfaceFlinger::onScreenAcquired() {
		ALOGD("Screen about to return, flinger = %p", this);
		sp<const DisplayDevice> hw(getDefaultDisplayDevice()); // XXX: this should be per DisplayDevice

services/surfaceflinger/SurfaceFlinger.h

+2 −7

Original line number	Diff line number	Diff line
		@@ -231,11 +231,9 @@ private:
		void signalLayerUpdate();
		void signalRefresh();

		// called on the main thread in response to initializeDisplays()
		void onInitializeDisplays();
		// called on the main thread in response to blank()
		// called on the main thread in response to screenReleased()
		void onScreenReleased();
		// called on the main thread in response to unblank()
		// called on the main thread in response to screenAcquired()
		void onScreenAcquired();

		void handleMessageTransaction();
		@@ -323,9 +321,6 @@ private:
		/* ------------------------------------------------------------------------
		* Display and layer stack management
		*/
		// called when starting, or restarting after system_server death
		void initializeDisplays();

		sp<const DisplayDevice> getDisplayDevice(DisplayID dpy) const {
		return mDisplays.valueFor(dpy);
		}