774156 - Fix NPE in Tabs when "Don't keep activities" is enabled

Status: VERIFIED FIXED

(Firefox for Android Graveyard :: General, defect)

Description

[Brian Nicholson (:bnicholson)]

Attachment: patch

Comment 1

[Mark Finkle (:mfinkle) (use needinfo?)]

Comment on attachment 642462 [details] [diff] [review]
patch

># HG changeset patch
># Parent c2760174d69844689f2ed95b83bff634c34ce0c2
># User Brian Nicholson <[e-mail]>
>diff --git a/mobile/android/base/Tabs.java b/mobile/android/base/Tabs.java
>--- a/mobile/android/base/Tabs.java
>+++ b/mobile/android/base/Tabs.java
>@@ -96,17 +96,18 @@ public class Tabs implements GeckoEventL
>         // This avoids a NPE below, but callers need to be careful to
>         // handle this case
>         if (tab == null)
>             return null;
> 
>         mSelectedTab = tab;
>         GeckoApp.mAppContext.mMainHandler.post(new Runnable() { 
>             public void run() {
>-                GeckoApp.mAppContext.mFormAssistPopup.hide();
>+                if (GeckoApp.mAppContext.mFormAssistPopup != null)
>+                    GeckoApp.mAppContext.mFormAssistPopup.hide();
>                 if (isSelectedTab(tab)) {
>                     String url = tab.getURL();
>                     notifyListeners(tab, TabEvents.SELECTED);
> 
>                     if (oldTab != null)
>                         notifyListeners(oldTab, TabEvents.UNSELECTED);
>                 }
>             }

Comment 2

[Brian Nicholson (:bnicholson)]

http://hg.mozilla.org/integration/mozilla-inbound/rev/2220334ff2d0

Comment 3

[Ed Morley [:emorley]]

https://hg.mozilla.org/mozilla-central/rev/2220334ff2d0

Comment 5

[Brian Nicholson (:bnicholson)]

Landed in http://hg.mozilla.org/releases/mozilla-beta/rev/b2487714085b