Bug 1128521 - Don't use API 17+ method in search activity. r=mfinkle
authorMargaret Leibovic <margaret.leibovic@gmail.com>
Tue, 03 Feb 2015 12:00:04 -0800
changeset 227521 cceedc43a9ecf210eab6ce66dd9f8fcc4f77f860
parent 227520 7a0ec58272938394ff87e06e05860a5ea8306ba9
child 227522 033918fb78199e6e61f622ddac0d6d8a951d7cea
push id28232
push userkwierso@gmail.com
push dateThu, 05 Feb 2015 01:21:17 +0000
treeherdermozilla-central@34a66aaaca81 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmfinkle
bugs1128521
milestone38.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1128521 - Don't use API 17+ method in search activity. r=mfinkle
mobile/android/search/java/org/mozilla/search/SearchActivity.java
--- a/mobile/android/search/java/org/mozilla/search/SearchActivity.java
+++ b/mobile/android/search/java/org/mozilla/search/SearchActivity.java
@@ -336,17 +336,17 @@ public class SearchActivity extends Loca
         set.addListener(new Animator.AnimatorListener() {
             @Override
             public void onAnimationStart(Animator animation) {
             }
 
             @Override
             public void onAnimationEnd(Animator animation) {
                 // Don't do anything if the activity is destroyed before the animation ends.
-                if (SearchActivity.this.isDestroyed()) {
+                if (searchEngineManager == null) {
                     return;
                 }
 
                 setEditState(EditState.WAITING);
                 setSearchState(SearchState.POSTSEARCH);
 
                 // We need to manually clear the animation for the views to be hidden on gingerbread.
                 animationCard.clearAnimation();