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

Commit 81c14d9d authored by Miranda Kephart's avatar Miranda Kephart Committed by Automerger Merge Worker
Browse files

Merge "Set mScreenBitmap before saveScreenshotAndToast" into tm-qpr-dev am: a5beb722 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21802579



Change-Id: Ida2a2ab76d18080ad7ec365554fcebaf3c23fc3e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7dd608ca a5beb722

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

+4 −4
Original line number Diff line number Diff line
@@ -419,6 +419,10 @@ public class ScreenshotController { 
            return;

        }



        mScreenBitmap = screenshot.getBitmap();

        String oldPackageName = mPackageName;

        mPackageName = screenshot.getPackageNameString();



        if (!isUserSetupComplete(Process.myUserHandle())) {

            Log.w(TAG, "User setup not complete, displaying toast only");

            // User setup isn't complete, so we don't want to show any UI beyond a toast, as editing
@@ -433,10 +437,6 @@ public class ScreenshotController { 
        mScreenshotTakenInPortrait =

                mContext.getResources().getConfiguration().orientation == ORIENTATION_PORTRAIT;



        String oldPackageName = mPackageName;

        mPackageName = screenshot.getPackageNameString();



        mScreenBitmap = screenshot.getBitmap();

        // Optimizations

        mScreenBitmap.setHasAlpha(false);

        mScreenBitmap.prepareToDraw();