diff options
| author | Nick Pelly <npelly@google.com> | 2011-08-06 18:48:04 -0700 |
|---|---|---|
| committer | Nick Pelly <npelly@google.com> | 2011-08-06 18:49:21 -0700 |
| commit | 7de0a268571d786c492e7013d5485fafcc59afbd (patch) | |
| tree | c88f0049d9a5674087a4f9ca716ec382a0b7a4e0 | |
| parent | 0840c4c1be3dc6edd285a6a38020b0f4eb1fdcba (diff) | |
| download | packages_apps_nfc-7de0a268571d786c492e7013d5485fafcc59afbd.zip packages_apps_nfc-7de0a268571d786c492e7013d5485fafcc59afbd.tar.gz packages_apps_nfc-7de0a268571d786c492e7013d5485fafcc59afbd.tar.bz2 | |
Turn on polling if NFC service restarts with screen on.
There was a bug where mScreenUnlocked is initialized incorrectly
when the screen is on.
Change-Id: Id1bc813f6927d23cc317c0f0da074c0cee160fe3
| -rwxr-xr-x | src/com/android/nfc/NfcService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java index 7e5f8d2..aa77ddb 100755 --- a/src/com/android/nfc/NfcService.java +++ b/src/com/android/nfc/NfcService.java @@ -304,7 +304,7 @@ public class NfcService extends Application implements DeviceHostListener, P2pSt mWakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "NfcService"); mKeyguard = (KeyguardManager) getSystemService(Context.KEYGUARD_SERVICE); - mScreenUnlocked = !mKeyguard.isKeyguardLocked() && !mKeyguard.isKeyguardSecure(); + mScreenUnlocked = pm.isScreenOn() && !mKeyguard.isKeyguardLocked(); ServiceManager.addService(SERVICE_NAME, mNfcAdapter); |