drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 41a894ad: am 75597105: Merge "SurfaceTextureClient: Add ISurfaceTexture getter." into honeycomb-mr1

Browse Source 
* commit '41a894ad1379a046b0b7471a33d974c6241a91a9':
  SurfaceTextureClient: Add ISurfaceTexture getter.
This commit is contained in:
Jamie Gennis
2011-03-15 10:40:26 -07:00
committed by Android Git Automerger
parent b15ab10c33 41a894ad13
commit c570ee21e2
3 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/gui/SurfaceTextureClient.h
View File

@ -33,6 +33,8 @@ class SurfaceTextureClient
public:
SurfaceTextureClient(const sp<ISurfaceTexture>& surfaceTexture);
sp<ISurfaceTexture> getISurfaceTexture() const;
private:
// can't be copied

4
libs/gui/SurfaceTextureClient.cpp
View File

@ -40,6 +40,10 @@ SurfaceTextureClient::SurfaceTextureClient(
mAllocator = mSurfaceTexture->getAllocator();
}
sp<ISurfaceTexture> SurfaceTextureClient::getISurfaceTexture() const {
return mSurfaceTexture;
}
int SurfaceTextureClient::setSwapInterval(ANativeWindow* window, int interval) {
SurfaceTextureClient* c = getSelf(window);
return c->setSwapInterval(interval);

5
libs/gui/tests/SurfaceTextureClient_test.cpp
View File

@ -35,6 +35,11 @@ protected:
sp<SurfaceTextureClient> mSTC;
};
TEST_F(SurfaceTextureClientTest, GetISurfaceTextureIsNotNull) {
sp<ISurfaceTexture> ist(mSTC->getISurfaceTexture());
ASSERT_TRUE(ist != NULL);
}
TEST_F(SurfaceTextureClientTest, QueuesToWindowCompositorIsFalse) {
sp<ANativeWindow> anw(mSTC);
int result = -123;