Merge pull request #8654 from brave/ntp_bg_img_svc_fix

Fix crash on null NTPBackgroundImagesService
brave · Apr 27, 2021 · da4f804 · da4f804
2 parents 28521e3 + f3f1bd8
commit da4f804
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/browser/ntp_background_images/android/ntp_background_images_bridge.cc b/browser/ntp_background_images/android/ntp_background_images_bridge.cc
@@ -83,11 +83,13 @@ NTPBackgroundImagesBridge::NTPBackgroundImagesBridge(Profile* profile)
   java_object_.Reset(Java_NTPBackgroundImagesBridge_create(
       AttachCurrentThread(), reinterpret_cast<intptr_t>(this)));
 
-  background_images_service_->AddObserver(this);
+  if (background_images_service_)
+    background_images_service_->AddObserver(this);
 }
 
 NTPBackgroundImagesBridge::~NTPBackgroundImagesBridge() {
-  background_images_service_->RemoveObserver(this);
+  if (background_images_service_)
+    background_images_service_->RemoveObserver(this);
   Java_NTPBackgroundImagesBridge_destroy(AttachCurrentThread(), java_object_);
 }