commit da6c510d93645ea936e23384731f8afa2253480a
author Neda Topoljanac <tneda@google.com> Wed Feb 22 15:42:59 2023 +0000
committer Neda Topoljanac <tneda@google.com> Wed Feb 22 15:44:27 2023 +0000
tree b6a2c6cf15aa55047fcaed59384348aeab484824
parent 6e841587f2f6840b1541f75ec2498339836d1606

Fix possible null referencing

Bug: N/A
Test: N/A
Change-Id: Ib062434a324848191f447b45e1d082be62e338a1

wear/protolayout/protolayout-renderer/src/main/java/androidx/wear/protolayout/renderer/inflater/WearCurvedLineView.java

diff --git a/wear/protolayout/protolayout-renderer/src/main/java/androidx/wear/protolayout/renderer/inflater/WearCurvedLineView.java b/wear/protolayout/protolayout-renderer/src/main/java/androidx/wear/protolayout/renderer/inflater/WearCurvedLineView.java
index 1ff8098..473e071 100644
--- a/wear/protolayout/protolayout-renderer/src/main/java/androidx/wear/protolayout/renderer/inflater/WearCurvedLineView.java
+++ b/wear/protolayout/protolayout-renderer/src/main/java/androidx/wear/protolayout/renderer/inflater/WearCurvedLineView.java
@@ -113,10 +113,11 @@
     }
 
     private void updatePathAndPaint() {
-        mPath = new Path();
         float insetPx = mThicknessPx / 2f;
 
         float clampedLineLength = resolveSweepAngleDegrees();
+        // Has to be below method call, otherwise it's not guaranteed that is not null.
+        mPath = new Path();
 
         if (clampedLineLength >= 360f) {
             // Android internally will take the modulus of the angle with 360, so drawing a full
@@ -252,6 +253,10 @@
 
     @Override
     protected void onDraw(@NonNull Canvas canvas) {
+        if (mPath == null || mPaint == null) {
+            return;
+        }
+
         canvas.drawPath(mPath, mPaint);
     }