Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa8af946 authored by Jean-Christophe PINCE's avatar Jean-Christophe PINCE Committed by PhantomGamers
Browse files

Memory leak due to bad destroy sequence 

During the destroy sequence, it happens that the mWebViewClassic was
set to null in the transferMessages function and consequently, the
call to WebCoreThreadWatchdog.unregisterWebView(mWebViewClassic) is
not really removing the view from the watchdog's list; creating a
memory leak.

picked from master branch https://android-review.googlesource.com/#/c/48087/



Change-Id: I2bae7c8d7c473e2af25e62a485699f88269d6658
Author: Jean-Christophe PINCE <jean-christophe.pince@intel.com>
Signed-off-by: default avatarJean-Christophe PINCE <jean-christophe.pince@intel.com>
Signed-off-by: default avatarShuo Gao <shuo.gao@intel.com>
Signed-off-by: default avatarBruce Beare <bruce.j.beare@intel.com>
Signed-off-by: default avatarJack Ren <jack.ren@intel.com>
Author-tracking-BZ: 57869
parent 362f5c45

core/java/android/webkit/WebViewCore.java

+1 −1
Original line number Diff line number Diff line
@@ -1278,6 +1278,7 @@ public final class WebViewCore { 
                                mBrowserFrame = null;

                                mSettings.onDestroyed();

                                mNativeClass = 0;

                                WebCoreThreadWatchdog.unregisterWebView(mWebViewClassic);

                                mWebViewClassic = null;

                            }

                            break;
@@ -1982,7 +1983,6 @@ public final class WebViewCore { 
            mEventHub.sendMessageAtFrontOfQueue(

                    Message.obtain(null, EventHub.DESTROY));

            mEventHub.blockMessages();

            WebCoreThreadWatchdog.unregisterWebView(mWebViewClassic);

        }

    }