PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Nfc Payment Preference check if the dialog is non-null before dismissing

Browse Source 
Test: monkey test
Bug: 64758793
Change-Id: I3905096889b2dc6ef468afc76e9767f63b4163ad
This commit is contained in:
Ruchi Kandoi
2017-08-16 13:24:14 -07:00
parent d0275e53eb
commit 8bd3ec13c6
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/nfc/NfcPaymentPreference.java
View File

@@ -18,6 +18,7 @@ package com.android.settings.nfc;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.content.ActivityNotFoundException; import android.content.ActivityNotFoundException;
import android.content.Context; import android.content.Context;
import android.app.Dialog;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.support.v7.preference.PreferenceViewHolder; import android.support.v7.preference.PreferenceViewHolder;
@@ -209,7 +210,9 @@ public class NfcPaymentPreference extends CustomDialogPreference implements
if (!appInfo.isDefault) { if (!appInfo.isDefault) {
mPaymentBackend.setDefaultPaymentApp(appInfo.componentName); mPaymentBackend.setDefaultPaymentApp(appInfo.componentName);
} }
getDialog().dismiss(); Dialog dialog = getDialog();
if (dialog != null)
dialog.dismiss();
} }
} }
} }