Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 103bc334 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Clearing screenshot bitmap references and recycling bitmap data... 

Merge "Clearing screenshot bitmap references and recycling bitmap data immediately after saving. (Bug 7974275)"
parents b16dcd14 cd6a9ef5

packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java

+12 −0
Original line number Diff line number Diff line
@@ -220,13 +220,21 @@ class SaveImageInBackgroundTask extends AsyncTask<SaveImageInBackgroundData, Voi 
            resolver.update(uri, values, null, null);



            params[0].imageUri = uri;

            params[0].image = null;

            params[0].result = 0;

        } catch (Exception e) {

            // IOException/UnsupportedOperationException may be thrown if external storage is not

            // mounted

            params[0].imageUri = null;

            params[0].image = null;

            params[0].result = 1;

        }



        // Recycle the bitmap data

        if (image != null) {

            image.recycle();

        }



        return params[0];

    }
@@ -461,6 +469,10 @@ class GlobalScreenshot { 
                // Save the screenshot once we have a bit of time now

                saveScreenshotInWorkerThread(finisher);

                mWindowManager.removeView(mScreenshotLayout);



                // Clear any references to the bitmap

                mScreenBitmap = null;

                mScreenshotView.setImageBitmap(null);

            }

        });

        mScreenshotLayout.post(new Runnable() {