mirror of
https://github.com/yurisieucuti/treble_evolution.git
synced 2024-11-24 10:56:22 +00:00
30 lines
990 B
Diff
30 lines
990 B
Diff
From a80b3c0b76ab20318bddaba2c344e0406caebbfd Mon Sep 17 00:00:00 2001
|
|
From: Pierre-Hugues Husson <phh@phh.me>
|
|
Date: Mon, 21 Dec 2020 19:36:54 +0100
|
|
Subject: [PATCH] Let vendor have priority over NFC config file, rather than
|
|
GSI
|
|
|
|
Thanks @mikalovtch
|
|
|
|
Change-Id: Iaee468f3b8e5c8ec90ca7e856a6526d1cbcaa33e
|
|
---
|
|
src/adaptation/nfc_config.cc | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/adaptation/nfc_config.cc b/src/adaptation/nfc_config.cc
|
|
index f635fd50..15d42cab 100644
|
|
--- a/src/adaptation/nfc_config.cc
|
|
+++ b/src/adaptation/nfc_config.cc
|
|
@@ -30,7 +30,7 @@ using namespace ::android::base;
|
|
namespace {
|
|
std::string searchConfigPath(std::string file_name) {
|
|
const std::vector<std::string> search_path = {
|
|
- "/product/etc/", "/odm/etc/", "/vendor/etc/", "/system_ext/etc/", "/etc/",
|
|
+ "/odm/etc/", "/vendor/etc/", "/product/etc/", "/system_ext/etc/", "/etc/",
|
|
};
|
|
for (std::string path : search_path) {
|
|
path.append(file_name);
|
|
--
|
|
2.25.1
|
|
|