commit feb64c5f788ff8549c88f08ec8d9fa7b68133750
author Alexandra Ducati-Manas <alexandra.ducati-manas@st.com> Thu Apr 18 16:05:56 2024 +0200
committer George Chang <georgekgchang@google.com> Fri Apr 26 01:07:25 2024 +0000
tree f801ea7a1f940ff78b7efd5ad6cb0855fc51d67e
parent 59d4377e8ccc1cc5c5e60d97d99679ea09fe18d0

Code cleanup: removed doEnableScreenOffSuspend/doDisableScreenOffSuspend

Bug: 335639730
Test: manual
Merged-In: Icc5d63e2019a5e44066ba76db52e88be73c5d757
Change-Id: Icc5d63e2019a5e44066ba76db52e88be73c5d757

nci/jni/NativeNfcManager.cpp

diff --git a/nci/jni/NativeNfcManager.cpp b/nci/jni/NativeNfcManager.cpp
index 896f656..7f6cae8 100644
--- a/nci/jni/NativeNfcManager.cpp
+++ b/nci/jni/NativeNfcManager.cpp
@@ -1818,16 +1818,6 @@
   prevScreenState = state;
 }
 
-static void nfcManager_doEnableScreenOffSuspend(JNIEnv* e, jobject o) {
-  PowerSwitch::getInstance().setScreenOffPowerState(
-      PowerSwitch::POWER_STATE_FULL);
-}
-
-static void nfcManager_doDisableScreenOffSuspend(JNIEnv* e, jobject o) {
-  PowerSwitch::getInstance().setScreenOffPowerState(
-      PowerSwitch::POWER_STATE_OFF);
-}
-
 /*******************************************************************************
 **
 ** Function:        nfcManager_getIsoDepMaxTransceiveLength
@@ -2151,14 +2141,8 @@
 
     {"doAbort", "(Ljava/lang/String;)V", (void*)nfcManager_doAbort},
 
-    {"doEnableScreenOffSuspend", "()V",
-     (void*)nfcManager_doEnableScreenOffSuspend},
-
     {"doSetScreenState", "(I)V", (void*)nfcManager_doSetScreenState},
 
-    {"doDisableScreenOffSuspend", "()V",
-     (void*)nfcManager_doDisableScreenOffSuspend},
-
     {"doDump", "(Ljava/io/FileDescriptor;)V", (void*)nfcManager_doDump},
 
     {"getNciVersion", "()I", (void*)nfcManager_doGetNciVersion},

nci/src/com/android/nfc/dhimpl/NativeNfcManager.java

diff --git a/nci/src/com/android/nfc/dhimpl/NativeNfcManager.java b/nci/src/com/android/nfc/dhimpl/NativeNfcManager.java
index 67a1f56..38d39e8 100755
--- a/nci/src/com/android/nfc/dhimpl/NativeNfcManager.java
+++ b/nci/src/com/android/nfc/dhimpl/NativeNfcManager.java
@@ -302,22 +302,6 @@
         doDump(fd);
     }
 
-    private native void doEnableScreenOffSuspend();
-
-    @Override
-    public boolean enableScreenOffSuspend() {
-        doEnableScreenOffSuspend();
-        return true;
-    }
-
-    private native void doDisableScreenOffSuspend();
-
-    @Override
-    public boolean disableScreenOffSuspend() {
-        doDisableScreenOffSuspend();
-        return true;
-    }
-
     private native boolean doSetNfcSecure(boolean enable);
 
     @Override

src/com/android/nfc/DeviceHost.java

diff --git a/src/com/android/nfc/DeviceHost.java b/src/com/android/nfc/DeviceHost.java
index b75fa9e..35b6877 100644
--- a/src/com/android/nfc/DeviceHost.java
+++ b/src/com/android/nfc/DeviceHost.java
@@ -182,10 +182,6 @@
 
     void dump(FileDescriptor fd);
 
-    boolean enableScreenOffSuspend();
-
-    boolean disableScreenOffSuspend();
-
     public void doSetScreenState(int screen_state_mask);
 
     public int getNciVersion();