diff options
Diffstat (limited to 'core/java/android/view')
| -rw-r--r-- | core/java/android/view/TextureView.java | 9 | ||||
| -rw-r--r-- | core/java/android/view/ViewAncestor.java | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/core/java/android/view/TextureView.java b/core/java/android/view/TextureView.java index 164c657..0421205 100644 --- a/core/java/android/view/TextureView.java +++ b/core/java/android/view/TextureView.java @@ -306,6 +306,8 @@ public class TextureView extends View { * <p><strong>Do not</strong> invoke this method from a drawing method * ({@link #onDraw(android.graphics.Canvas)} for instance).</p> * + * <p>If an error occurs during the copy, an empty bitmap will be returned.</p> + * * @return A valid {@link Bitmap.Config#ARGB_8888} bitmap, or null if the surface * texture is not available or the width <= 0 or the height <= 0 * @@ -328,6 +330,8 @@ public class TextureView extends View { * <p><strong>Do not</strong> invoke this method from a drawing method * ({@link #onDraw(android.graphics.Canvas)} for instance).</p> * + * <p>If an error occurs during the copy, an empty bitmap will be returned.</p> + * * @param width The width of the bitmap to create * @param height The height of the bitmap to create * @@ -354,6 +358,8 @@ public class TextureView extends View { * <p><strong>Do not</strong> invoke this method from a drawing method * ({@link #onDraw(android.graphics.Canvas)} for instance).</p> * + * <p>If an error occurs, the bitmap is left unchanged.</p> + * * @param bitmap The bitmap to copy the content of the surface texture into, * cannot be null, all configurations are supported * @@ -447,5 +453,6 @@ public class TextureView extends View { public void onSurfaceTextureDestroyed(SurfaceTexture surface); } - private static native void nSetDefaultBufferSize(SurfaceTexture surfaceTexture, int width, int height); + private static native void nSetDefaultBufferSize(SurfaceTexture surfaceTexture, + int width, int height); } diff --git a/core/java/android/view/ViewAncestor.java b/core/java/android/view/ViewAncestor.java index ba3ae58..afbedaf 100644 --- a/core/java/android/view/ViewAncestor.java +++ b/core/java/android/view/ViewAncestor.java @@ -4479,7 +4479,7 @@ public final class ViewAncestor extends Handler implements ViewParent, ArrayList<View> foundViews = mAttachInfo.mFocusablesTempList; foundViews.clear(); - View root = null; + View root; if (accessibilityViewId != View.NO_ID) { root = findViewByAccessibilityId(accessibilityViewId); } else { |