diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2015-04-06 17:54:18 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-06 17:54:18 +0000 |
| commit | 778f47e5afcbe8af7283fabcfd32193e8aca1949 (patch) | |
| tree | 40cd16f721149f77b9b1087b3a0418c240a43ac2 /services | |
| parent | 1d065987ebe5a3ac9480f7871b6fb69fca98ef85 (diff) | |
| parent | 069f4cbccb651d98e4c50eca4698624ea089804d (diff) | |
| download | frameworks_base-778f47e5afcbe8af7283fabcfd32193e8aca1949.zip frameworks_base-778f47e5afcbe8af7283fabcfd32193e8aca1949.tar.gz frameworks_base-778f47e5afcbe8af7283fabcfd32193e8aca1949.tar.bz2 | |
am 069f4cbc: Merge "Fix memory leak in Connectivity Service when phone app crashes"
* commit '069f4cbccb651d98e4c50eca4698624ea089804d':
Fix memory leak in Connectivity Service when phone app crashes
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/ConnectivityService.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index d9ef766..758b0fc 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 |