Merge "Fix NPE of mDismissListener in Rename Dialog"
This commit is contained in:
committed by
Android (Google) Code Review
commit
a4b2bc9b2b
@@ -1020,7 +1020,9 @@ public class FingerprintSettings extends SubSettings {
|
||||
@Override
|
||||
public void onCancel(DialogInterface dialog) {
|
||||
super.onCancel(dialog);
|
||||
mDismissListener.onDismiss(dialog);
|
||||
if (mDismissListener != null) {
|
||||
mDismissListener.onDismiss(dialog);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -1058,7 +1060,9 @@ public class FingerprintSettings extends SubSettings {
|
||||
parent.renameFingerPrint(mFp.getBiometricId(),
|
||||
newName);
|
||||
}
|
||||
mDismissListener.onDismiss(dialog);
|
||||
if (mDismissListener != null) {
|
||||
mDismissListener.onDismiss(dialog);
|
||||
}
|
||||
dialog.dismiss();
|
||||
}
|
||||
})
|
||||
|
Reference in New Issue
Block a user