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

Commit d507ff21 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 22449 into eclair 

* changes:
  Check for a null history item to avoid crashing.
parents ba9f5f3f af31c3a4

core/java/android/webkit/BrowserFrame.java

+10 −11
Original line number Diff line number Diff line
@@ -343,19 +343,18 @@ class BrowserFrame extends Handler { 
        switch (msg.what) {

            case FRAME_COMPLETED: {

                if (mSettings.getSavePassword() && hasPasswordField()) {

                    if (DebugFlags.BROWSER_FRAME) {

                        Assert.assertNotNull(mCallbackProxy.getBackForwardList()

                                .getCurrentItem());

                    }

                    WebAddress uri = new WebAddress(

                            mCallbackProxy.getBackForwardList().getCurrentItem()

                            .getUrl());

                    WebHistoryItem item = mCallbackProxy.getBackForwardList()

                            .getCurrentItem();

                    if (item != null) {

                        WebAddress uri = new WebAddress(item.getUrl());

                        String schemePlusHost = uri.mScheme + uri.mHost;

                    String[] up = mDatabase.getUsernamePassword(schemePlusHost);

                        String[] up =

                                mDatabase.getUsernamePassword(schemePlusHost);

                        if (up != null && up[0] != null) {

                            setUsernamePassword(up[0], up[1]);

                        }

                    }

                }

                CacheManager.trimCacheIfNeeded();

                break;

            }