From: uazo Date: Sat, 22 Jul 2023 13:58:40 +0000 Subject: Disable Feeback Collector License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html --- chrome/browser/feedback/BUILD.gn | 8 +++--- .../browser/feedback/FeedbackCollector.java | 28 ++----------------- 2 files changed, 7 insertions(+), 29 deletions(-) diff --git a/chrome/browser/feedback/BUILD.gn b/chrome/browser/feedback/BUILD.gn --- a/chrome/browser/feedback/BUILD.gn +++ b/chrome/browser/feedback/BUILD.gn @@ -15,10 +15,10 @@ source_set("feedback") { public_deps = [] deps = [] if (is_android) { - sources += [ - "android/family_info_feedback_source.cc", - "android/family_info_feedback_source.h", - ] + # sources += [ + # "android/family_info_feedback_source.cc", + # "android/family_info_feedback_source.h", + # ] public_deps += [ "//components/supervised_user/core/browser", "//components/supervised_user/core/browser:fetcher", diff --git a/chrome/browser/feedback/android/java/src/org/chromium/chrome/browser/feedback/FeedbackCollector.java b/chrome/browser/feedback/android/java/src/org/chromium/chrome/browser/feedback/FeedbackCollector.java --- a/chrome/browser/feedback/android/java/src/org/chromium/chrome/browser/feedback/FeedbackCollector.java +++ b/chrome/browser/feedback/android/java/src/org/chromium/chrome/browser/feedback/FeedbackCollector.java @@ -29,6 +29,7 @@ import org.chromium.components.signin.identitymanager.ConsentLevel; import org.chromium.components.signin.identitymanager.IdentityManager; import java.util.HashMap; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -73,31 +74,8 @@ public abstract class FeedbackCollector implements Runnable { @Nullable ScreenshotSource screenshotTask, T initParams, Profile profile) { - // 1. Build all synchronous and asynchronous sources and determine the currently signed in - // account. - mSynchronousSources = buildSynchronousFeedbackSources(activity, initParams); - mAsynchronousSources = buildAsynchronousFeedbackSources(initParams); - IdentityManager identityManager = - IdentityServicesProvider.get().getIdentityManager(profile); - if (identityManager != null) { - mAccountInUse = - CoreAccountInfo.getEmailFrom( - identityManager.getPrimaryAccountInfo(ConsentLevel.SIGNIN)); - } - - // Validation check in case a source is added to the wrong list. - for (FeedbackSource source : mSynchronousSources) { - assert !(source instanceof AsyncFeedbackSource); - } - - // 2. Set |mScreenshotTask| if not null. - if (screenshotTask != null) mScreenshotTask = screenshotTask; - - // 3. Start all asynchronous sources and the screenshot task. - for (var source : mAsynchronousSources) { - source.start(this); - } - if (mScreenshotTask != null) mScreenshotTask.capture(this); + mSynchronousSources = new ArrayList<>(); + mAsynchronousSources = new ArrayList<>(); // 4. Kick off a task to timeout the async sources. ThreadUtils.postOnUiThreadDelayed(this, TIMEOUT_MS); --