Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Ida2a2ab76d18080ad7ec365554fcebaf3c23fc3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Miranda Kephart
2023-03-07 19:01:08 +00:00
committed by Automerger Merge Worker
parent 7dd608caec a5beb722bb
commit 81c14d9db4
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java
View File

@@ -419,6 +419,10 @@ public class ScreenshotController {
return; return;
} }
mScreenBitmap = screenshot.getBitmap();
String oldPackageName = mPackageName;
mPackageName = screenshot.getPackageNameString();
if (!isUserSetupComplete(Process.myUserHandle())) { if (!isUserSetupComplete(Process.myUserHandle())) {
Log.w(TAG, "User setup not complete, displaying toast only"); 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 // 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 = mScreenshotTakenInPortrait =
mContext.getResources().getConfiguration().orientation == ORIENTATION_PORTRAIT; mContext.getResources().getConfiguration().orientation == ORIENTATION_PORTRAIT;
String oldPackageName = mPackageName;
mPackageName = screenshot.getPackageNameString();
mScreenBitmap = screenshot.getBitmap();
// Optimizations // Optimizations
mScreenBitmap.setHasAlpha(false); mScreenBitmap.setHasAlpha(false);
mScreenBitmap.prepareToDraw(); mScreenBitmap.prepareToDraw();