commit 06853a774482f1121f40f2f4859dfd53a74dad6c
author Jean Chalard <jchalard@google.com> Wed Nov 02 08:06:03 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 02 08:06:03 2022 +0000
tree c43e0cf4cf796f81e50e952616f96742e484e5ca
parent 44243b98570da422e358777015d52324f0543ded
parent 79b0de9ef2137bcb8caae7ee39cc4f1c75532675

Merge "Fix memory leak of ConnectivityManager"

framework/src/android/net/ConnectivityManager.java

diff --git a/framework/src/android/net/ConnectivityManager.java b/framework/src/android/net/ConnectivityManager.java
index 547b4ba..b5c3c64 100644
--- a/framework/src/android/net/ConnectivityManager.java
+++ b/framework/src/android/net/ConnectivityManager.java
@@ -4080,7 +4080,7 @@
         }
     }
 
-    private class CallbackHandler extends Handler {
+    private static class CallbackHandler extends Handler {
         private static final String TAG = "ConnectivityManager.CallbackHandler";
         private static final boolean DBG = false;
 
@@ -4095,7 +4095,10 @@
         @Override
         public void handleMessage(Message message) {
             if (message.what == EXPIRE_LEGACY_REQUEST) {
-                expireRequest((NetworkCapabilities) message.obj, message.arg1);
+                // the sInstance can't be null because to send this message a ConnectivityManager
+                // instance must have been created prior to creating the thread on which this
+                // Handler is running.
+                sInstance.expireRequest((NetworkCapabilities) message.obj, message.arg1);
                 return;
             }