diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2022-05-12 17:38:58 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-05-12 17:38:58 +0000 |
| commit | 362989b32427fb397498eed09342d409d482ac74 (patch) | |
| tree | 9173f7c922e12c985daf114ff4df4ae7309ea003 | |
| parent | 1b3ca2f87c6af4570ef6182ffff6e8179dfb24df (diff) | |
| parent | 0d11a7d023d73e73631905185e2a0ca138f2793a (diff) | |
| download | Nfc-362989b32427fb397498eed09342d409d482ac74.tar.gz | |
Merge "Handle shutdown for right user" into tm-dev am: 0d11a7d023
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Nfc/+/18178968
Change-Id: Idf6c7d0da05c54ed16161e5299e453074b1fe2d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | src/com/android/nfc/NfcService.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java index 6f96bb9a..6ab45a58 100644 --- a/src/com/android/nfc/NfcService.java +++ b/src/com/android/nfc/NfcService.java @@ -3324,6 +3324,10 @@ public class NfcService implements DeviceHostListener { action.equals(Intent.ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE)) { updatePackageCache(); } else if (action.equals(Intent.ACTION_SHUTDOWN)) { + if (DBG) Log.d(TAG, "Shutdown received with UserId: " + getSendingUserId()); + if (getSendingUserId() != UserHandle.USER_ALL) { + return; + } if (DBG) Log.d(TAG, "Device is shutting down."); if (mIsAlwaysOnSupported && mAlwaysOnState == NfcAdapter.STATE_ON) { new EnableDisableTask().execute(TASK_DISABLE_ALWAYS_ON); |