From d1027f53385789c45fe454aebb0b8e964670d35e Mon Sep 17 00:00:00 2001 From: Maunik Shah Date: Mon, 30 Mar 2015 11:36:42 +0530 Subject: [PATCH] Fix memory leak in Connectivity Service when phone app crashes Upon crash of com.android.phone process, NetworkFactoryInfo is not getting removed from HashMap and will get accumulated on every start of the process. Change-Id: Iafde28daddfc82728c03208522682b1efc85a121 --- services/core/java/com/android/server/ConnectivityService.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index d9ef766f2b..758b0fc4bb 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -2022,6 +2022,8 @@ public class ConnectivityService extends IConnectivityManager.Stub ReapUnvalidatedNetworks.DONT_REAP); } } + NetworkFactoryInfo nfi = mNetworkFactoryInfos.remove(msg.replyTo); + if (DBG && nfi != null) log("unregisterNetworkFactory for " + nfi.name); } // If this method proves to be too slow then we can maintain a separate