From f757d485d45a0a9f93986c26ac4a697adbb8e38e Mon Sep 17 00:00:00 2001
From: "Harpreet \"Eli\" Sangha" <eliptus@google.com>
Date: Tue, 21 Dec 2021 02:33:33 +0000
Subject: [PATCH 1/2] Revert "Move dck.eligible_wcc back to 3 for R4"

This reverts commit 67cccb2750f90560ff4b086c855161bcbe3159b9.

Reason for revert: b/210746264

Change-Id: I19da43552eb21a35816289838872636743e77602
---
 device-raven.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/device-raven.mk b/device-raven.mk
index fa1d053..3f14733 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -200,7 +200,7 @@ PRODUCT_PRODUCT_PROPERTIES += ro.com.google.ime.kb_pad_port_l=11
 
 # DCK properties based on target
 PRODUCT_PROPERTY_OVERRIDES += \
-    ro.gms.dck.eligible_wcc=3
+    ro.gms.dck.eligible_wcc=2
 
 # SKU specific RROs
 PRODUCT_PACKAGES += \

From 4b540fc70f23c4ee9261bea332e6a96c36693587 Mon Sep 17 00:00:00 2001
From: Avinash Malipatil <avinashmp@google.com>
Date: Tue, 21 Dec 2021 18:56:47 +0000
Subject: [PATCH 2/2] Control ONS Auto provisioning via device configuration

Bug: 211649038
Test: Manual. Modify the enable_ons_auto_provisioning flag to true in config.xml, build, flash and adb log should not have ERR_AUTO_PROVISIONING_DISABLED
Change-Id: Ia684e5b55fd69cbb15cfbcc0f511d01baa955c5a
---
 .../res/values/config.xml                      | 18 ++++++++++++++++++
 .../res/values/config.xml                      | 18 ++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 oriole/overlay/packages/services/AlternativeNetworkAccess/res/values/config.xml
 create mode 100644 raven/overlay/packages/services/AlternativeNetworkAccess/res/values/config.xml

diff --git a/oriole/overlay/packages/services/AlternativeNetworkAccess/res/values/config.xml b/oriole/overlay/packages/services/AlternativeNetworkAccess/res/values/config.xml
new file mode 100644
index 0000000..46c95af
--- /dev/null
+++ b/oriole/overlay/packages/services/AlternativeNetworkAccess/res/values/config.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+  <bool name="enable_ons_auto_provisioning">true</bool>
+</resources>
diff --git a/raven/overlay/packages/services/AlternativeNetworkAccess/res/values/config.xml b/raven/overlay/packages/services/AlternativeNetworkAccess/res/values/config.xml
new file mode 100644
index 0000000..46c95af
--- /dev/null
+++ b/raven/overlay/packages/services/AlternativeNetworkAccess/res/values/config.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+  <bool name="enable_ons_auto_provisioning">true</bool>
+</resources>