summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2021-09-09 09:14:01 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-09-09 09:14:01 +0000
commita1c6f734c5aa1fa5929bc0bab840abfaf640716b (patch)
tree2eaf82f778c47d15351811562e0eb56520437233
parent5f359870b109346e04b8730722e302759f5b20dd (diff)
parent5673af7cb403526089d26bcc92935837ae4af4b0 (diff)
downloadplatform_packages_apps_Nfc-a1c6f734c5aa1fa5929bc0bab840abfaf640716b.tar.gz
platform_packages_apps_Nfc-a1c6f734c5aa1fa5929bc0bab840abfaf640716b.tar.bz2
platform_packages_apps_Nfc-a1c6f734c5aa1fa5929bc0bab840abfaf640716b.zip
Merge "Only send the message when the screen state change" am: 5673af7cb4
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Nfc/+/1821694 Change-Id: I163efdee963e21f3914426df9d75a177e554842b
-rw-r--r--src/com/android/nfc/NfcService.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java
index 1cb5fe3f..e52cd608 100644
--- a/src/com/android/nfc/NfcService.java
+++ b/src/com/android/nfc/NfcService.java
@@ -3165,7 +3165,9 @@ public class NfcService implements DeviceHostListener {
if (nci_version != NCI_VERSION_2_0) {
new ApplyRoutingTask().execute(Integer.valueOf(screenState));
}
- sendMessage(NfcService.MSG_APPLY_SCREEN_STATE, screenState);
+ if (mScreenState != screenState) {
+ sendMessage(NfcService.MSG_APPLY_SCREEN_STATE, screenState);
+ }
} else if (action.equals(Intent.ACTION_USER_SWITCHED)) {
int userId = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, 0);
mUserId = userId;