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

Merge "Nfc Payment Preference check if the dialog is non-null before dismissing" into oc-mr1-dev

Browse Source 
am: 7a5e42f3db

Change-Id: Ib4477e392d4f7fd2d647ddaef3088be934d31210
This commit is contained in:
Ruchi Kandoi
2017-08-17 01:21:51 +00:00
committed by android-build-merger
parent f7a818345d 7a5e42f3db
commit 1030cf5ad4
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.content.ActivityNotFoundException;
import android.content.Context;
import android.app.Dialog;
import android.content.DialogInterface;
import android.content.Intent;
import android.support.v7.preference.PreferenceViewHolder;
@@ -209,7 +210,9 @@ public class NfcPaymentPreference extends CustomDialogPreference implements
if (!appInfo.isDefault) {
mPaymentBackend.setDefaultPaymentApp(appInfo.componentName);
}
getDialog().dismiss();
Dialog dialog = getDialog();
if (dialog != null)
dialog.dismiss();
}
}
}