Merge "Fixes resource file exemption."
diff --git a/OWNERS b/OWNERS
index d1d6f81..881e2c7 100644
--- a/OWNERS
+++ b/OWNERS
@@ -3,13 +3,22 @@
# People who can approve changes for submission
arcwang@google.com
+chaohuiw@google.com
chiujason@google.com
+cyl@google.com
edgarwang@google.com
-emilychuang@google.com
+llz@google.com
millchen@google.com
+songchenxi@google.com
stanleytfwang@google.com
sunnyshao@google.com
yantingyang@google.com
+ykhung@google.com
+
+# Emergency only
+lijun@google.com
+wangqi@google.com
+yanglu@google.com
# Exempt resource files (because they are in a flat directory and too hard to manage via OWNERS)
per-file res/**=*
diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
index 44b3a40..650a7f6 100644
--- a/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
+++ b/src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
@@ -906,7 +906,9 @@
@Override
public void onCancel(DialogInterface dialog) {
super.onCancel(dialog);
- mDismissListener.onDismiss(dialog);
+ if (mDismissListener != null) {
+ mDismissListener.onDismiss(dialog);
+ }
}
@Override
@@ -944,7 +946,9 @@
parent.renameFingerPrint(mFp.getBiometricId(),
newName);
}
- mDismissListener.onDismiss(dialog);
+ if (mDismissListener != null) {
+ mDismissListener.onDismiss(dialog);
+ }
dialog.dismiss();
}
})