commit 5c5b215a26af474dc49d77cbe64a28a2ba84d7c2
author nxpandroid <srikrishna.pramoda@nxp.com> Thu Sep 14 12:30:17 2017 +0530
committer nxpandroid <srikrishna.pramoda@nxp.com> Thu Sep 14 12:30:17 2017 +0530
tree 82cf493bd7a65749712ab2d5619a36e9d72fa83b
parent ae3f60ae77842f40bd835f9a5f65c50e1433f084

GKI memory leak observed during NFC ON/OFF and SemDaemon

src/com/android/nfc/NfcService.java

diff --git a/src/com/android/nfc/NfcService.java b/src/com/android/nfc/NfcService.java
index 49beeeb..716cf4a 100755
--- a/src/com/android/nfc/NfcService.java
+++ b/src/com/android/nfc/NfcService.java
@@ -1049,6 +1049,8 @@
         new EnableDisableTask().execute(TASK_BOOT);  // do blocking boot tasks
 
         mHandler.sendEmptyMessageDelayed(MSG_UPDATE_STATS, STATS_UPDATE_INTERVAL_MS);
+        /*SoundPool clean up before NFC state updated*/
+        initSoundPool();
     }
 
     void initSoundPool() {
@@ -1487,7 +1489,6 @@
                 }
             }
 
-            initSoundPool();
             /* Start polling loop */
             Log.e(TAG, "applyRouting -3");
             mScreenState = mScreenStateHelper.checkScreenState();
@@ -1522,6 +1523,8 @@
             }
             Log.i(TAG, "Disabling NFC");
             updateState(NfcAdapter.STATE_TURNING_OFF);
+            /*SoundPool clean up before NFC state updated
+            releaseSoundPool();*/
 
             /* Sometimes mDeviceHost.deinitialize() hangs, use a watch-dog.
              * Implemented with a new thread (instead of a Handler or AsyncTask),
@@ -1581,7 +1584,6 @@
                 updateState(NfcAdapter.STATE_OFF);
             }
 
-            releaseSoundPool();
 
             return result;
         }