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

Commit 38d07a18 authored by Selim Gurun's avatar Selim Gurun Committed by Android (Google) Code Review
Browse files

Merge "Fix WebView crashes"

parents cd161864 0e61883f

core/java/android/app/ContextImpl.java

+2 −2
Original line number Diff line number Diff line
@@ -1896,7 +1896,7 @@ class ContextImpl extends Context { 
                pi.getResDir(),

                pi.getSplitResDirs(),

                pi.getOverlayDirs(),

                pi.getSharedLibraries(),

                pi.getApplicationInfo().sharedLibraryFiles,

                displayId,

                overrideConfig,

                compatInfo,
@@ -2180,7 +2180,7 @@ class ContextImpl extends Context { 
                packageInfo.getResDir(),

                splitDirs,

                packageInfo.getOverlayDirs(),

                packageInfo.getSharedLibraries(),

                packageInfo.getApplicationInfo().sharedLibraryFiles,

                displayId,

                overrideConfiguration,

                compatInfo,

core/java/android/app/LoadedApk.java

+2 −6
Original line number Diff line number Diff line
@@ -311,7 +311,7 @@ public final class LoadedApk { 
                }



                mResources = ResourcesManager.getInstance().getResources(null, mResDir,

                        splitPaths, mOverlayDirs, mSharedLibraries,

                        splitPaths, mOverlayDirs, mApplicationInfo.sharedLibraryFiles,

                        Display.DEFAULT_DISPLAY, null, getCompatibilityInfo(),

                        getClassLoader());

            }
@@ -923,10 +923,6 @@ public final class LoadedApk { 
        return mOverlayDirs;

    }



    public String[] getSharedLibraries() {

        return mSharedLibraries;

    }



    public String getDataDir() {

        return mDataDir;

    }
@@ -958,7 +954,7 @@ public final class LoadedApk { 
            }



            mResources = ResourcesManager.getInstance().getResources(null, mResDir,

                    splitPaths, mOverlayDirs, mSharedLibraries,

                    splitPaths, mOverlayDirs, mApplicationInfo.sharedLibraryFiles,

                    Display.DEFAULT_DISPLAY, null, getCompatibilityInfo(),

                    getClassLoader());

        }