Skip to content

Commit acabf48

Browse files
committed
remove unneeded code
Change-Id: I07e2fca7274d2e12bf5b4aee0050794bdb97a8b3
1 parent dfbcee6 commit acabf48

File tree

2 files changed

+2
-22
lines changed

2 files changed

+2
-22
lines changed

services/surfaceflinger/SurfaceFlinger.cpp

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,8 @@ void SurfaceFlinger::binderDied(const wp<IBinder>& who)
188188
// the window manager died on us. prepare its eulogy.
189189

190190
// reset screen orientation
191-
setOrientation(0, eOrientationDefault, 0);
191+
Vector<ComposerState> state;
192+
setTransactionState(state, eOrientationDefault, 0);
192193

193194
// restart the boot-animation
194195
property_set("ctl.start", "bootanim");
@@ -1225,26 +1226,6 @@ void SurfaceFlinger::setTransactionState(const Vector<ComposerState>& state,
12251226
}
12261227
}
12271228

1228-
int SurfaceFlinger::setOrientation(DisplayID dpy,
1229-
int orientation, uint32_t flags)
1230-
{
1231-
if (CC_UNLIKELY(uint32_t(dpy) >= DISPLAY_COUNT))
1232-
return BAD_VALUE;
1233-
1234-
Mutex::Autolock _l(mStateLock);
1235-
if (mCurrentState.orientation != orientation) {
1236-
if (uint32_t(orientation)<=eOrientation270 || orientation==42) {
1237-
mCurrentState.orientationFlags = flags;
1238-
mCurrentState.orientation = orientation;
1239-
setTransactionFlags(eTransactionNeeded);
1240-
mTransactionCV.wait(mStateLock);
1241-
} else {
1242-
orientation = BAD_VALUE;
1243-
}
1244-
}
1245-
return orientation;
1246-
}
1247-
12481229
sp<ISurface> SurfaceFlinger::createSurface(
12491230
ISurfaceComposerClient::surface_data_t* params,
12501231
const String8& name,

services/surfaceflinger/SurfaceFlinger.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,6 @@ class SurfaceFlinger :
170170
virtual void bootFinished();
171171
virtual void setTransactionState(const Vector<ComposerState>& state,
172172
int orientation, uint32_t flags);
173-
virtual int setOrientation(DisplayID dpy, int orientation, uint32_t flags);
174173
virtual bool authenticateSurfaceTexture(const sp<ISurfaceTexture>& surface) const;
175174
virtual sp<IDisplayEventConnection> createDisplayEventConnection();
176175

0 commit comments

Comments
 (0)