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

Fix NPE when WebView is being destroyed prior to callback completion.

Browse Source 
Change-Id: I964c8b7846e37b554b9bda8cda4f62f3e3851691
http://b/2947192
This commit is contained in:
Derek Sollenberger
2010-09-01 08:55:22 -04:00
parent 9c12bd3932
commit c92de67da3
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/webkit/WebView.java
View File

@@ -938,7 +938,7 @@ public class WebView extends AbsoluteLayout
return;
}
if (sGoogleApps.contains(packageName)) {
if (sGoogleApps.contains(packageName) && mWebViewCore != null) {
if (Intent.ACTION_PACKAGE_ADDED.equals(action)) {
mWebViewCore.sendMessage(EventHub.ADD_PACKAGE_NAME, packageName);
} else {
@@ -975,7 +975,9 @@ public class WebView extends AbsoluteLayout
// Executes on the UI thread
@Override
protected void onPostExecute(Set<String> installedPackages) {
mWebViewCore.sendMessage(EventHub.ADD_PACKAGE_NAMES, installedPackages);
if (mWebViewCore != null) {
mWebViewCore.sendMessage(EventHub.ADD_PACKAGE_NAMES, installedPackages);
}
}
};
task.execute();