summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2014-05-07 00:51:50 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-07 00:51:50 +0000
commit88cf32e3006da27b10151f1dfb3645976f26bde2 (patch)
tree9b4dbc912705e2b26d85b643878ac4e0307f9a7b /api
parent8c239f1c26a5218f5838603c16b407ff3f4d0fc4 (diff)
parent6c8e788e37dea5db682e2ad405f8e1b23990765e (diff)
downloadframeworks_base-88cf32e3006da27b10151f1dfb3645976f26bde2.zip
frameworks_base-88cf32e3006da27b10151f1dfb3645976f26bde2.tar.gz
frameworks_base-88cf32e3006da27b10151f1dfb3645976f26bde2.tar.bz2
am 31c0962a: Merge "Fix crash due to texture view callback threading invariants."
* commit '31c0962a2cdb507486507cc96d7b9a214e9849d3': Fix crash due to texture view callback threading invariants.
Diffstat (limited to 'api')
-rw-r--r--api/current.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 113874d..ba0e108 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -10734,6 +10734,7 @@ package android.graphics {
method public void releaseTexImage();
method public void setDefaultBufferSize(int, int);
method public void setOnFrameAvailableListener(android.graphics.SurfaceTexture.OnFrameAvailableListener);
+ method public void setOnFrameAvailableListener(android.graphics.SurfaceTexture.OnFrameAvailableListener, android.os.Handler);
method public void updateTexImage();
}