Don't conditionally enable snooze.

We keep our devices in snooze by default now.

Change-Id: Ia84635031d60221da054448b8c81c5c48f1f821d

2 files changed, 5 insertions, 11 deletions

diff --git a/nci/jni/NativeNfcManager.cpp b/nci/jni/NativeNfcManager.cpp
index e80c1cb1..c02bd677 100755
--- a/nci/jni/NativeNfcManager.cpp
+++ b/nci/jni/NativeNfcManager.cpp
@@ -781,7 +781,7 @@ static jboolean nfcManager_unrouteAid (JNIEnv* e, jobject, jbyteArray aid)
 ** Returns:         True if ok.
 **
 *******************************************************************************/
-static jboolean nfcManager_doInitialize (JNIEnv* e, jobject o, jboolean snooze_mode)
+static jboolean nfcManager_doInitialize (JNIEnv* e, jobject o)
 {
     ALOGD ("%s: enter; ver=%s nfa=%s NCI_VERSION=0x%02X",
         __FUNCTION__, nfca_version_string, nfa_version_string, NCI_VERSION);
@@ -807,12 +807,6 @@ static jboolean nfcManager_doInitialize (JNIEnv* e, jobject o, jboolean snooze_m
             SyncEventGuard guard (sNfaEnableEvent);
             tHAL_NFC_ENTRY* halFuncEntries = theInstance.GetHalEntryFuncs ();
 
-            if (snooze_mode)
-            {
-                powerSwitch.setScreenOffPowerState (
-                    PowerSwitch::POWER_STATE_FULL);
-            }
-
             NFA_Init (halFuncEntries);
 
             stat = NFA_Enable (nfaDeviceManagementCallback, nfaConnectionCallback);
@@ -1565,7 +1559,7 @@ static JNINativeMethod gMethods[] =
     {"initializeNativeStructure", "()Z",
             (void*) nfcManager_initNativeStruc},
 
-    {"doInitialize", "(Z)Z",
+    {"doInitialize", "()Z",
             (void*) nfcManager_doInitialize},
 
     {"doDeinitialize", "()Z",
diff --git a/nci/src/com/android/nfc/dhimpl/NativeNfcManager.java b/nci/src/com/android/nfc/dhimpl/NativeNfcManager.java
index 87489e6f..650417a4 100755
--- a/nci/src/com/android/nfc/dhimpl/NativeNfcManager.java
+++ b/nci/src/com/android/nfc/dhimpl/NativeNfcManager.java
@@ -67,11 +67,11 @@ public class NativeNfcManager implements DeviceHost {
         doDownload();
     }
 
-    private native boolean doInitialize(boolean enableScreenOffSuspend);
+    private native boolean doInitialize();
 
     @Override
-    public boolean initialize(boolean enableScreenOffSuspend) {
-        return doInitialize(enableScreenOffSuspend);
+    public boolean initialize() {
+        return doInitialize();
     }
 
     private native boolean doDeinitialize();