Commit 7168d6aa authored by Jacob Dufault's avatar Jacob Dufault Committed by Commit Bot

Revert "cros: Temporarily allow fingerprint on nocturne."

This reverts commit 92eb6fcb.

Reason for revert: Policy change got approval which makes this CL unnecessary 

Original change's description:
> cros: Temporarily allow fingerprint on nocturne.
> 
> Bug: 896458
> Change-Id: I774285cd49260e227a57cd8d786ba2b31efd08ad
> Reviewed-on: https://chromium-review.googlesource.com/c/1286666
> Reviewed-by: Wenzhao (Colin) Zang <wzang@chromium.org>
> Commit-Queue: Jacob Dufault <jdufault@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#600594}

TBR=jdufault@chromium.org,wzang@chromium.org

Change-Id: I39013e6fc3a62f96a792865b43a9270b9fd61069
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 896458
Reviewed-on: https://chromium-review.googlesource.com/c/1289074Reviewed-by: default avatarJacob Dufault <jdufault@chromium.org>
Commit-Queue: Jacob Dufault <jdufault@chromium.org>
Cr-Commit-Position: refs/heads/master@{#600804}
parent 3f936360
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
#include "chrome/browser/chromeos/login/quick_unlock/quick_unlock_utils.h" #include "chrome/browser/chromeos/login/quick_unlock/quick_unlock_utils.h"
#include "base/feature_list.h" #include "base/feature_list.h"
#include "base/sys_info.h"
#include "base/time/time.h" #include "base/time/time.h"
#include "chrome/browser/browser_process.h" #include "chrome/browser/browser_process.h"
#include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
...@@ -40,19 +39,7 @@ bool HasPolicyValue(const PrefService* pref_service, const char* value) { ...@@ -40,19 +39,7 @@ bool HasPolicyValue(const PrefService* pref_service, const char* value) {
quick_unlock_whitelist->end(); quick_unlock_whitelist->end();
} }
std::string GetBoardName() {
const std::vector<std::string> board =
base::SplitString(base::SysInfo::GetLsbReleaseBoard(), "-",
base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
return board[0];
}
bool IsFingerprintDisabledByPolicy(const PrefService* pref_service) { bool IsFingerprintDisabledByPolicy(const PrefService* pref_service) {
// Always allow fingerprint on nocturne. This is a temporary measure to allow
// dogfooding.
if (GetBoardName() == "nocturne")
return false;
const bool enabled = const bool enabled =
HasPolicyValue(pref_service, kQuickUnlockWhitelistOptionAll) || HasPolicyValue(pref_service, kQuickUnlockWhitelistOptionAll) ||
HasPolicyValue(pref_service, kQuickUnlockWhitelistOptionFingerprint); HasPolicyValue(pref_service, kQuickUnlockWhitelistOptionFingerprint);
......
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