Merge "Avoid leaking Surface native object." into jb-mr2-dev

2013-04-25 21:43:27 +00:00
parent b044c40c15 21ef9647e8
commit 99ba72039d
1 changed files with 8 additions and 4 deletions
--- a/services/java/com/android/server/power/ElectronBeam.java
+++ b/services/java/com/android/server/power/ElectronBeam.java
@@ -389,10 +389,14 @@ final class ElectronBeam {
                mTexNamesGenerated = true;
            }

-            SurfaceTexture st = new SurfaceTexture(mTexNames[0]);
-            SurfaceControl.screenshot(SurfaceControl.getBuiltInDisplay(
-                    SurfaceControl.BUILT_IN_DISPLAY_ID_MAIN),
-                    new Surface(st));
+            final SurfaceTexture st = new SurfaceTexture(mTexNames[0]);
+            final Surface s = new Surface(st);
+            try {
+                SurfaceControl.screenshot(SurfaceControl.getBuiltInDisplay(
+                        SurfaceControl.BUILT_IN_DISPLAY_ID_MAIN), s);
+            } finally {
+                s.release();
+            }

            st.updateTexImage();
            st.getTransformMatrix(mTexMatrix);