From adf0cabe0a1ac3efecb2f46dffd0ca5fa22ba5fb Mon Sep 17 00:00:00 2001
From: Curtis Belmonte <curtislb@google.com>
Date: Wed, 26 May 2021 15:45:38 -0700
Subject: [PATCH] Fix crash due to traffic light face Lottie animation

Load the animation asset only if enabled in the resource config, to
avoid crashing on unsupported device configurations.

Test: Manual

Fixes: 189290180
Change-Id: Iae46c735277777705c1d6f4595b557e4b0b1aef7
---
 res/layout/face_enroll_education.xml                          | 4 ++--
 .../android/settings/biometrics/face/FaceEnrollEducation.java | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/res/layout/face_enroll_education.xml b/res/layout/face_enroll_education.xml
index 646856fcfdd..01494790c97 100644
--- a/res/layout/face_enroll_education.xml
+++ b/res/layout/face_enroll_education.xml
@@ -47,6 +47,7 @@
                 android:layout_height="wrap_content"
                 app:sudVideo="@raw/face_education"/>
 
+            <!-- Animation res MUST be set in code, gated by config_face_education_use_lottie. -->
             <com.airbnb.lottie.LottieAnimationView
                 android:id="@+id/illustration_lottie"
                 android:layout_width="match_parent"
@@ -54,8 +55,7 @@
                 android:scaleType="fitCenter"
                 android:visibility="invisible"
                 app:lottie_autoPlay="true"
-                app:lottie_loop="true"
-                app:lottie_rawRes="@raw/face_education_lottie" />
+                app:lottie_loop="true" />
 
             <ImageView
                 android:id="@+id/illustration_accessibility"
diff --git a/src/com/android/settings/biometrics/face/FaceEnrollEducation.java b/src/com/android/settings/biometrics/face/FaceEnrollEducation.java
index 49a4748baaf..8e2d3f4b6bc 100644
--- a/src/com/android/settings/biometrics/face/FaceEnrollEducation.java
+++ b/src/com/android/settings/biometrics/face/FaceEnrollEducation.java
@@ -112,6 +112,7 @@ public class FaceEnrollEducation extends BiometricEnrollBase {
         if (mIsUsingLottie) {
             mIllustrationDefault.stop();
             mIllustrationDefault.setVisibility(View.INVISIBLE);
+            mIllustrationLottie.setAnimation(R.raw.face_education_lottie);
             mIllustrationLottie.setVisibility(View.VISIBLE);
             mIllustrationLottie.playAnimation();
         }