Bug 1209967 - Remove Asserts from BrowserApp. r=me
authorMichael Comella <michael.l.comella@gmail.com>
Wed, 25 Nov 2015 11:39:23 -0800
changeset 276449 fc016918523a24516460d82c5ff02b6986d30aac
parent 276448 cd6e88a87d0646c35433df83420981bd5dd8e01c
child 276450 0497e398a7e268b42c65ecf41846a599500d481c
push id69162
push usercbook@mozilla.com
push dateTue, 15 Dec 2015 13:52:23 +0000
treeherdermozilla-inbound@98d65afd9826 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1209967
milestone45.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 1209967 - Remove Asserts from BrowserApp. r=me We added some Asserts but the robocop tests fail for an unknown reason. The error was: E/MessageQueue-JNI( 1972): java.lang.IllegalAccessError: Class ref in pre-verified class resolved to unexpected implementation I tried a few things but in the end just decided to remove them.
mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
--- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
+++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
@@ -3189,30 +3189,28 @@ public class BrowserApp extends GeckoApp
         if (!Restrictions.isAllowed(this, Restrictable.INSTALL_EXTENSION)) {
             MenuUtils.safeSetVisible(aMenu, R.id.addons, false);
         }
 
         return true;
     }
 
     private int resolveBookmarkIconID(final boolean isBookmark) {
-        Assert.isTrue(Versions.feature11Plus, "We don't use menu icons on v11+ so don't set them to conserve resources.");
         if (isBookmark) {
             return R.drawable.ic_menu_bookmark_remove;
         } else {
             return R.drawable.ic_menu_bookmark_add;
         }
     }
 
     private int resolveBookmarkTitleID(final boolean isBookmark) {
         return (isBookmark ? R.string.bookmark_remove : R.string.bookmark);
     }
 
     private int resolveReadingListIconID(final boolean isInReadingList) {
-        Assert.isTrue(Versions.feature11Plus, "We don't use menu icons on v11+ so don't set them to conserve resources.");
         return (isInReadingList ? R.drawable.ic_menu_reader_remove : R.drawable.ic_menu_reader_add);
     }
 
     private int resolveReadingListTitleID(final boolean isInReadingList) {
         return (isInReadingList ? R.string.reading_list_remove : R.string.overlay_share_reading_list_btn_label);
     }
 
     @Override