Commit 6298d31b authored by Varun Khaneja's avatar Varun Khaneja Committed by Commit Bot

Make MaybeCaptureSafetyNetId() a NO-OP for now.

This change needs to be merged back to M74 too :(
For M75, I'll send a follow-upCL that enables this feature behind a
Finch flag that's disabled by default.

The relevant GmsCore release should be out soon so it should be safe for
M75 release.

R=drubery

Bug: 954255
Change-Id: Iebb0f78aa4fd6e5219ffa3645c98fcf1b5d32244
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1574143
Auto-Submit: Varun Khaneja <vakh@chromium.org>
Commit-Queue: Varun Khaneja <vakh@chromium.org>
Commit-Queue: Daniel Rubery <drubery@chromium.org>
Reviewed-by: default avatarDaniel Rubery <drubery@chromium.org>
Cr-Commit-Position: refs/heads/master@{#652261}
parent f6fd738d
...@@ -248,18 +248,9 @@ AndroidTelemetryService::GetReport(download::DownloadItem* item) { ...@@ -248,18 +248,9 @@ AndroidTelemetryService::GetReport(download::DownloadItem* item) {
void AndroidTelemetryService::MaybeCaptureSafetyNetId() { void AndroidTelemetryService::MaybeCaptureSafetyNetId() {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI); DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
DCHECK(sb_service_->database_manager()); // NO-OP for now, similar to M73. Will be enabled via a Finch flag
if (!safety_net_id_on_ui_thread_.empty() || // that's disabled by default later.
!sb_service_->database_manager()->IsSupported()) { return;
return;
}
base::PostTaskWithTraitsAndReplyWithResult(
FROM_HERE, {content::BrowserThread::IO},
base::BindOnce(&SafeBrowsingDatabaseManager::GetSafetyNetId,
sb_service_->database_manager()),
base::BindOnce(&AndroidTelemetryService::SetSafetyNetIdOnUIThread,
weak_ptr_factory_.GetWeakPtr()));
} }
void AndroidTelemetryService::MaybeSendApkDownloadReport( void AndroidTelemetryService::MaybeSendApkDownloadReport(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment