From 5b8606023341b24846c7ab84d83978145eb7ff06 Mon Sep 17 00:00:00 2001 From: Derek Sollenberger Date: Thu, 29 Mar 2018 17:29:29 -0400 Subject: [PATCH] Fix drawing sequence from using deprecated Canvas APIs. Bug: 77286317 Test: marlin-userdebug reboots successfully Change-Id: I72688931f29ff9db6bb1e39af9d313be7df33a03 --- .../com/android/server/wm/StrictModeFlash.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/services/core/java/com/android/server/wm/StrictModeFlash.java b/services/core/java/com/android/server/wm/StrictModeFlash.java index f51a6a921984c..e97b36683362e 100644 --- a/services/core/java/com/android/server/wm/StrictModeFlash.java +++ b/services/core/java/com/android/server/wm/StrictModeFlash.java @@ -79,17 +79,25 @@ class StrictModeFlash { } // Top - c.clipRect(new Rect(0, 0, dw, mThickness), Region.Op.REPLACE); + c.save(); + c.clipRect(new Rect(0, 0, dw, mThickness)); c.drawColor(Color.RED); + c.restore(); // Left - c.clipRect(new Rect(0, 0, mThickness, dh), Region.Op.REPLACE); + c.save(); + c.clipRect(new Rect(0, 0, mThickness, dh)); c.drawColor(Color.RED); + c.restore(); // Right - c.clipRect(new Rect(dw - mThickness, 0, dw, dh), Region.Op.REPLACE); + c.save(); + c.clipRect(new Rect(dw - mThickness, 0, dw, dh)); c.drawColor(Color.RED); + c.restore(); // Bottom - c.clipRect(new Rect(0, dh - mThickness, dw, dh), Region.Op.REPLACE); + c.save(); + c.clipRect(new Rect(0, dh - mThickness, dw, dh)); c.drawColor(Color.RED); + c.restore(); mSurface.unlockCanvasAndPost(c); }