Merge pull request #6206 from brave/pr6205_android_sync_settings_cras…

…h_1.12.x [Android] Fix for crash on Sync settings when rewards are not available (uplift to 1.12.x)
brave · Jul 27, 2020 · e1e32da · e1e32da
2 parents 4b566f0 + 78a90e6
commit e1e32da
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/android/java/org/chromium/chrome/browser/settings/BravePreferenceFragment.java b/android/java/org/chromium/chrome/browser/settings/BravePreferenceFragment.java
@@ -59,6 +59,7 @@ public void onResume() {
         super.onResume();
         if (!ChromeFeatureList.isEnabled(BraveFeatureList.BRAVE_REWARDS)
                 || BravePrefServiceBridge.getInstance().getSafetynetCheckFailed()) {
+            if (getPreferenceScreen() == null) return;
             Preference braveRewardsDebugPreference =
                     getPreferenceScreen().findPreference(BraveRewardsDebugPreferences.KEY);
             if (braveRewardsDebugPreference != null) {