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