Merge "Adding tracepoints for tracking lock icon state" into qt-dev

am: 29b47f7596

Change-Id: Ic9802f7478d443043fc99db5e017bc0d8c60938a

packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java

@@ -29,6 +29,7 @@ import android.graphics.drawable.AnimatedVectorDrawable;
 import android.graphics.drawable.Drawable;
 import android.hardware.biometrics.BiometricSourceType;
 import android.os.Handler;
+import android.os.Trace;
 import android.util.AttributeSet;
 import android.view.ViewGroup;
 import android.view.accessibility.AccessibilityNodeInfo;
@@ -256,9 +257,12 @@ public class LockIcon extends KeyguardAffordanceView implements OnUserInfoChange
                             if (getDrawable() == animation && state == getState()
                                     && doesAnimationLoop(iconAnimRes)) {
                                 animation.start();
+                            } else {
+                                Trace.endAsyncSection("LockIcon#Animation", state);
                             }
                         }
                     });
+                    Trace.beginAsyncSection("LockIcon#Animation", state);
                     animation.start();
                 }
             }