From c1bad8e02906626fbef32c13faae9bec3a44c27d Mon Sep 17 00:00:00 2001
From: Pranjal Jumde <pranjal.jumde@gmail.com>
Date: Tue, 3 Nov 2020 10:09:04 -0800
Subject: [PATCH] Fix #12492: Disable idle detection API

---
 app/brave_main_delegate.cc                                      | 1 +
 app/brave_main_delegate_browsertest.cc                          | 1 +
 .../site_settings/BraveSiteSettingsPreferencesBase.java         | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/app/brave_main_delegate.cc b/app/brave_main_delegate.cc
index 2120f61b35f5..4b10256f612a 100644
--- a/app/brave_main_delegate.cc
+++ b/app/brave_main_delegate.cc
@@ -227,6 +227,7 @@ bool BraveMainDelegate::BasicStartupComplete(int* exit_code) {
     autofill::features::kAutofillServerCommunication.name,
     blink::features::kTextFragmentAnchor.name,
     features::kAllowPopupsDuringPageUnload.name,
+    features::kIdleDetection.name,
     features::kNotificationTriggers.name,
     features::kPrivacySettingsRedesign.name,
     features::kSignedExchangeSubresourcePrefetch.name,
diff --git a/app/brave_main_delegate_browsertest.cc b/app/brave_main_delegate_browsertest.cc
index df99bff34ffa..1abd35cd1cd9 100644
--- a/app/brave_main_delegate_browsertest.cc
+++ b/app/brave_main_delegate_browsertest.cc
@@ -66,6 +66,7 @@ IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisabledFeatures) {
       &autofill::features::kAutofillServerCommunication,
       &blink::features::kTextFragmentAnchor,
       &features::kAllowPopupsDuringPageUnload,
+      &features::kIdleDetection,
       &features::kNotificationTriggers,
       &features::kPrivacySettingsRedesign,
       &features::kSignedExchangeSubresourcePrefetch,
diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BraveSiteSettingsPreferencesBase.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BraveSiteSettingsPreferencesBase.java
index 72ff7edf3c03..3f704a288dad 100644
--- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BraveSiteSettingsPreferencesBase.java
+++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BraveSiteSettingsPreferencesBase.java
@@ -20,6 +20,7 @@ public class BraveSiteSettingsPreferencesBase extends SiteSettingsPreferenceFrag
     private static final String BACKGROUND_SYNC_KEY = "background_sync";
     private static final String PLAY_YT_VIDEO_IN_BROWSER_KEY = "play_yt_video_in_browser";
     private static final String DESKTOP_MODE_KEY = "desktop_mode";
+    private static final String IDLE_DETECTION = "idle_detection";
 
     private final HashMap<String, Preference> mRemovedPreferences = new HashMap<>();
 
@@ -65,6 +66,7 @@ private void removePreferenceIfPresent(String key) {
     }
 
     private void configureBravePreferences() {
+        removePreferenceIfPresent(IDLE_DETECTION);
         removePreferenceIfPresent(ADS_KEY);
         removePreferenceIfPresent(BACKGROUND_SYNC_KEY);
     }