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

Commit 4d830071 authored by Ben Murdoch's avatar Ben Murdoch
Browse files

No need to pass an AssetManager to native when creating a WebView 

See external/webkit change:
Ia6c17634f535ed75b2a0757ac4d53f1a0befb78a

Bug: 5084146
Change-Id: I5a2e87d03d73fa74ebb00c33567783225ed97d3a
parent 2fd1f816

core/java/android/webkit/WebView.java

+2 −4
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import android.content.Intent; 
import android.content.IntentFilter;

import android.content.pm.PackageInfo;

import android.content.pm.PackageManager;

import android.content.res.AssetManager;

import android.content.res.Configuration;

import android.database.DataSetObserver;

import android.graphics.Bitmap;
@@ -8104,8 +8103,7 @@ public class WebView extends AbsoluteLayout 
                    // nativeCreate sets mNativeClass to a non-zero value

                    String drawableDir = BrowserFrame.getRawResFilename(

                            BrowserFrame.DRAWABLEDIR, mContext);

                    AssetManager am = mContext.getAssets();

                    nativeCreate(msg.arg1, drawableDir, am);

                    nativeCreate(msg.arg1, drawableDir);

                    if (mDelaySetPicture != null) {

                        setNewPicture(mDelaySetPicture, true);

                        mDelaySetPicture = null;
@@ -9140,7 +9138,7 @@ public class WebView extends AbsoluteLayout 
    private native Rect nativeCacheHitNodeBounds();

    private native int nativeCacheHitNodePointer();

    /* package */ native void nativeClearCursor();

    private native void     nativeCreate(int ptr, String drawableDir, AssetManager am);

    private native void     nativeCreate(int ptr, String drawableDir);

    private native int      nativeCursorFramePointer();

    private native Rect     nativeCursorNodeBounds();

    private native int nativeCursorNodePointer();