commit ceb23d4407e730f689a819e36367e1951ee3a6f9
author Chaohui Wang <chaohuiw@google.com> Tue Oct 10 03:27:50 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 10 03:27:50 2023 +0000
tree 69a0b429d97271a40bec0b8b92e813e3eaf87573
parent fe96df972e146ee258801358b0ff393bd9c067ef
parent 6395cf8d30444f7f2a4eee830af5e3915013a150

Merge "Unify the default template and title" into main

Android.bp

diff --git a/Android.bp b/Android.bp
index 20f8634..f5b593d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -123,6 +123,13 @@
         "androidx.room_room-compiler-plugin",
     ],
 
+    errorprone: {
+        extra_check_modules: ["//external/nullaway:nullaway_plugin"],
+        javacflags: [
+            "-XepOpt:NullAway:AnnotatedPackages=com.android.settings",
+        ],
+    },
+
     libs: [
         "telephony-common",
         "ims-common",

src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java

diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
index c62ab3b..be2a948 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java
@@ -203,6 +203,10 @@
         final int currentDensity = displayDensity.getDefaultDisplayDensityValues()
                 [currentDensityIndex];
         final int defaultDensity = displayDensity.getDefaultDensityForDefaultDisplay();
+
+        if (getResources().getConfiguration().fontScale > 1) {
+            return false;
+        }
         return defaultDensity == currentDensity;
     }