diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-08-07 03:16:35 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-08-07 03:16:35 +0000 |
| commit | 426faefc2f5adf04481c31a84c3ea0a08942df7b (patch) | |
| tree | f20c6663c84a72d08355ecae0004d837ee4540dd | |
| parent | 67717c4d9d7fb11f6af1feda82efd1207b1e4e48 (diff) | |
| parent | c9f2f6c0ba3ab5fe2dfaba274a11ea4a3efa9645 (diff) | |
| download | platform_packages_apps_Nfc-android10-c2f2-release.tar.gz platform_packages_apps_Nfc-android10-c2f2-release.tar.bz2 platform_packages_apps_Nfc-android10-c2f2-release.zip | |
Snap for 5785232 from c9f2f6c0ba3ab5fe2dfaba274a11ea4a3efa9645 to qt-c2f2-releaseandroid-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-release
Change-Id: Iac9c8f3eeac42241fe9ba4ba17bb8a4068d25827
| -rw-r--r-- | src/com/android/nfc/NfcService.java | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java index 45075f54..96134cc6 100644 --- a/src/com/android/nfc/NfcService.java +++ b/src/com/android/nfc/NfcService.java @@ -2187,11 +2187,11 @@ public class NfcService implements DeviceHostListener { if (!tag.reconnect()) { tag.disconnect(); if (mScreenState == ScreenStateHelper.SCREEN_STATE_ON_UNLOCKED) { - if (mToast == null) { - mToast = Toast.makeText(mContext, - R.string.tag_read_error, Toast.LENGTH_SHORT); + if (mToast != null) { + if (mToast.getView().isShown()) mToast.cancel(); } - mToast.setText(R.string.tag_read_error); + mToast = Toast.makeText(mContext, R.string.tag_read_error, + Toast.LENGTH_SHORT); mToast.show(); } break; @@ -2557,12 +2557,12 @@ public class NfcService implements DeviceHostListener { if (dispatchResult == NfcDispatcher.DISPATCH_FAIL && !mInProvisionMode) { unregisterObject(tagEndpoint.getHandle()); if (mScreenState == ScreenStateHelper.SCREEN_STATE_ON_UNLOCKED) { - if (mToast == null) { - mToast = Toast.makeText(mContext, - R.string.tag_dispatch_failed, Toast.LENGTH_SHORT); - } - mToast.setText(R.string.tag_dispatch_failed); - mToast.show(); + if (mToast != null) { + if (mToast.getView().isShown()) mToast.cancel(); + } + mToast = Toast.makeText(mContext, R.string.tag_dispatch_failed, + Toast.LENGTH_SHORT); + mToast.show(); } playSound(SOUND_ERROR); } else if (dispatchResult == NfcDispatcher.DISPATCH_SUCCESS) { |