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

Commit 32f902fa authored by Han Xu's avatar Han Xu Committed by Automerger Merge Worker
Browse files

Merge "Fix wifi QR decorator not rendering" into udc-dev am: f8f3ecfb 

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



Change-Id: Ic1c9bddbfb6d3695dfed08dd0e273b1de915fc85
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 994d8b2a f8f3ecfb

packages/SettingsLib/src/com/android/settingslib/qrcode/QrDecorateView.java

+0 −3
Original line number Diff line number Diff line
@@ -95,9 +95,6 @@ public class QrDecorateView extends View { 
    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {

        super.onLayout(changed, left, top, right, bottom);



        if (!isLaidOut()) {

            return;

        }

        if (mMaskBitmap == null) {

            mMaskBitmap = Bitmap.createBitmap(getWidth(), getHeight(), Bitmap.Config.ARGB_8888);

            mMaskCanvas = new Canvas(mMaskBitmap);