From c9e666179932a97fffc3cc7a3d581f2f6525f71e Mon Sep 17 00:00:00 2001 From: Jing-wei Wu Date: Tue, 26 Sep 2017 16:12:15 +0800 Subject: [PATCH] Bug 1401871 - Check if menu item(home_add_to_launcher) exists or not before accessing it. r=nechen We temporarily hide `home_add_to_launcher` in API 26, which means directly accesses it without checking if it exists or not would cause NullPointerException. MozReview-Commit-ID: KXnP81ZZa6u --HG-- extra : rebase_source : 9189f3ab940d50702f82365824feff441faeef5a --- .../base/java/org/mozilla/gecko/home/HomeFragment.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mobile/android/base/java/org/mozilla/gecko/home/HomeFragment.java b/mobile/android/base/java/org/mozilla/gecko/home/HomeFragment.java index 728eccfe525f..63c5cb72b8b8 100644 --- a/mobile/android/base/java/org/mozilla/gecko/home/HomeFragment.java +++ b/mobile/android/base/java/org/mozilla/gecko/home/HomeFragment.java @@ -208,7 +208,11 @@ public abstract class HomeFragment extends Fragment { menu.findItem(R.id.home_open_private_tab).setVisible(false); menu.findItem(R.id.home_copyurl).setVisible(false); menu.findItem(R.id.home_share).setVisible(false); - menu.findItem(R.id.home_add_to_launcher).setVisible(false); + + final MenuItem addToLauncherItem = menu.findItem(R.id.home_add_to_launcher); + if (addToLauncherItem != null) { + addToLauncherItem.setVisible(false); + } menu.findItem(R.id.home_set_as_homepage).setVisible(false); menu.findItem(R.id.home_as_pin).setVisible(false);