Merge https://github.com/LineageOS/android_packages_apps_Settings into HEADw16.0

Change-Id: I0bb12b8388769880a62fa840779c6a69b12e519e

1 files changed, 8 insertions, 1 deletions

diff --git a/tests/robotests/src/com/android/settings/biometrics/MultiBiometricEnrollHelperTest.java b/tests/robotests/src/com/android/settings/biometrics/MultiBiometricEnrollHelperTest.java
index 03b3b48461d..76a1e346669 100644
--- a/tests/robotests/src/com/android/settings/biometrics/MultiBiometricEnrollHelperTest.java
+++ b/tests/robotests/src/com/android/settings/biometrics/MultiBiometricEnrollHelperTest.java
@@ -140,9 +140,16 @@ public class MultiBiometricEnrollHelperTest {
         final ShadowPackageManager shadowPackageManager = shadowOf(mContext.getPackageManager());
         shadowPackageManager.setSystemFeature(PackageManager.FEATURE_FACE, true);
         ShadowUtils.setFaceManager(mFaceManager);
-        ActivityController.of(new FaceEnrollIntroduction(), mFaceIntent)
+        ActivityController.of(new TestFaceEnrollIntroduction(), mFaceIntent)
                 .create(mFaceIntent.getExtras()).get();
 
         verify(mFaceManager).generateChallenge(eq(mUserId), any());
     }
+
+    private static class TestFaceEnrollIntroduction extends FaceEnrollIntroduction {
+        @Override
+        public String getLaunchedFromPackage() {
+            return getPackageName();
+        }
+    }
 }