Loading services/surfaceflinger/SurfaceFlinger.cpp +2 −21 Original line number Diff line number Diff line Loading @@ -188,7 +188,8 @@ void SurfaceFlinger::binderDied(const wp<IBinder>& who) // the window manager died on us. prepare its eulogy. // reset screen orientation setOrientation(0, eOrientationDefault, 0); Vector<ComposerState> state; setTransactionState(state, eOrientationDefault, 0); // restart the boot-animation property_set("ctl.start", "bootanim"); Loading Loading @@ -1225,26 +1226,6 @@ void SurfaceFlinger::setTransactionState(const Vector<ComposerState>& state, } } int SurfaceFlinger::setOrientation(DisplayID dpy, int orientation, uint32_t flags) { if (CC_UNLIKELY(uint32_t(dpy) >= DISPLAY_COUNT)) return BAD_VALUE; Mutex::Autolock _l(mStateLock); if (mCurrentState.orientation != orientation) { if (uint32_t(orientation)<=eOrientation270 || orientation==42) { mCurrentState.orientationFlags = flags; mCurrentState.orientation = orientation; setTransactionFlags(eTransactionNeeded); mTransactionCV.wait(mStateLock); } else { orientation = BAD_VALUE; } } return orientation; } sp<ISurface> SurfaceFlinger::createSurface( ISurfaceComposerClient::surface_data_t* params, const String8& name, Loading services/surfaceflinger/SurfaceFlinger.h +0 −1 Original line number Diff line number Diff line Loading @@ -170,7 +170,6 @@ public: virtual void bootFinished(); virtual void setTransactionState(const Vector<ComposerState>& state, int orientation, uint32_t flags); virtual int setOrientation(DisplayID dpy, int orientation, uint32_t flags); virtual bool authenticateSurfaceTexture(const sp<ISurfaceTexture>& surface) const; virtual sp<IDisplayEventConnection> createDisplayEventConnection(); Loading Loading
services/surfaceflinger/SurfaceFlinger.cpp +2 −21 Original line number Diff line number Diff line Loading @@ -188,7 +188,8 @@ void SurfaceFlinger::binderDied(const wp<IBinder>& who) // the window manager died on us. prepare its eulogy. // reset screen orientation setOrientation(0, eOrientationDefault, 0); Vector<ComposerState> state; setTransactionState(state, eOrientationDefault, 0); // restart the boot-animation property_set("ctl.start", "bootanim"); Loading Loading @@ -1225,26 +1226,6 @@ void SurfaceFlinger::setTransactionState(const Vector<ComposerState>& state, } } int SurfaceFlinger::setOrientation(DisplayID dpy, int orientation, uint32_t flags) { if (CC_UNLIKELY(uint32_t(dpy) >= DISPLAY_COUNT)) return BAD_VALUE; Mutex::Autolock _l(mStateLock); if (mCurrentState.orientation != orientation) { if (uint32_t(orientation)<=eOrientation270 || orientation==42) { mCurrentState.orientationFlags = flags; mCurrentState.orientation = orientation; setTransactionFlags(eTransactionNeeded); mTransactionCV.wait(mStateLock); } else { orientation = BAD_VALUE; } } return orientation; } sp<ISurface> SurfaceFlinger::createSurface( ISurfaceComposerClient::surface_data_t* params, const String8& name, Loading
services/surfaceflinger/SurfaceFlinger.h +0 −1 Original line number Diff line number Diff line Loading @@ -170,7 +170,6 @@ public: virtual void bootFinished(); virtual void setTransactionState(const Vector<ComposerState>& state, int orientation, uint32_t flags); virtual int setOrientation(DisplayID dpy, int orientation, uint32_t flags); virtual bool authenticateSurfaceTexture(const sp<ISurfaceTexture>& surface) const; virtual sp<IDisplayEventConnection> createDisplayEventConnection(); Loading