diff options
| author | Nick Pelly <npelly@google.com> | 2011-08-08 09:14:01 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-08 09:14:01 -0700 |
| commit | 57f4a1659a3b65e93081bb43ae2aefcda7ba00d8 (patch) | |
| tree | 2d8fa4e418110ebdd65f9506e6c151d9ba9de4aa /src | |
| parent | 12585b616cb0f9cd176704a0d199c8aeb797a3df (diff) | |
| parent | 7de0a268571d786c492e7013d5485fafcc59afbd (diff) | |
| download | packages_apps_nfc-57f4a1659a3b65e93081bb43ae2aefcda7ba00d8.zip packages_apps_nfc-57f4a1659a3b65e93081bb43ae2aefcda7ba00d8.tar.gz packages_apps_nfc-57f4a1659a3b65e93081bb43ae2aefcda7ba00d8.tar.bz2 | |
Merge "Turn on polling if NFC service restarts with screen on."
Diffstat (limited to 'src')
| -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); |