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

Merge change 22449 into eclair

Browse Source 
* changes:
  Check for a null history item to avoid crashing.
This commit is contained in:
Android (Google) Code Review
2009-08-24 11:00:30 -07:00
parent ba9f5f3f6b af31c3a42d
commit d507ff2129
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/java/android/webkit/BrowserFrame.java
View File

@@ -343,17 +343,16 @@ class BrowserFrame extends Handler {
switch (msg.what) { switch (msg.what) {
case FRAME_COMPLETED: { case FRAME_COMPLETED: {
if (mSettings.getSavePassword() && hasPasswordField()) { if (mSettings.getSavePassword() && hasPasswordField()) {
if (DebugFlags.BROWSER_FRAME) { WebHistoryItem item = mCallbackProxy.getBackForwardList()
Assert.assertNotNull(mCallbackProxy.getBackForwardList() .getCurrentItem();
.getCurrentItem()); if (item != null) {
} WebAddress uri = new WebAddress(item.getUrl());
WebAddress uri = new WebAddress( String schemePlusHost = uri.mScheme + uri.mHost;
mCallbackProxy.getBackForwardList().getCurrentItem() String[] up =
.getUrl()); mDatabase.getUsernamePassword(schemePlusHost);
String schemePlusHost = uri.mScheme + uri.mHost; if (up != null && up[0] != null) {
String[] up = mDatabase.getUsernamePassword(schemePlusHost); setUsernamePassword(up[0], up[1]);
if (up != null && up[0] != null) { }
setUsernamePassword(up[0], up[1]);
} }
} }
CacheManager.trimCacheIfNeeded(); CacheManager.trimCacheIfNeeded();