Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix WebView crashes

Browse Source 
Use the sharedLibraryFiles from ApplicationInfo, which is
what WebView patches.

Bug:34761805
Test: None
Change-Id: I5a496e8e017842a3fa30b956edf1b16c9459c5f0
This commit is contained in:
Adam Lesinski
2017-02-07 11:40:12 -08:00
parent 8be89a2f02
commit 0e61883f5d
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/app/ContextImpl.java
View File

@@ -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,

8
core/java/android/app/LoadedApk.java
View File

@@ -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());
}