From b439f4b560c520e29c00ac0a5ae7621917c818cc Mon Sep 17 00:00:00 2001
From: gollarx <ratnakumarix.golla@intel.com>
Date: Thu, 15 Sep 2022 18:16:20 +0530
Subject: [PATCH 1/2] Configure rro overlay for connectivity to address CTS
 issue

Keepalive packet offloading is enabled by default. CTS test cases
are failing as the keepalive offloading event is not received.

As Keepalive is not supported, configure the rro overlay for
ServiceConnectivityResource to disable the
networkSupportedKeepaliveCount to fix the Cts Net TC module issue.

Tracked-On: OAM-104109
Signed-off-by: gollarx <ratnakumarix.golla@intel.com>
Signed-off-by: Austin Sun <austin.sun@intel.com>
---
 .../Android.bp                                | 23 ++++++++++++++
 .../AndroidManifest.xml                       | 30 +++++++++++++++++++
 .../res/values/config.xml                     | 29 ++++++++++++++++++
 3 files changed, 82 insertions(+)
 create mode 100644 rro_overlays/ServiceConnectivityResourcesOverlay/Android.bp
 create mode 100644 rro_overlays/ServiceConnectivityResourcesOverlay/AndroidManifest.xml
 create mode 100644 rro_overlays/ServiceConnectivityResourcesOverlay/res/values/config.xml

diff --git a/rro_overlays/ServiceConnectivityResourcesOverlay/Android.bp b/rro_overlays/ServiceConnectivityResourcesOverlay/Android.bp
new file mode 100644
index 00000000..5ed47e36
--- /dev/null
+++ b/rro_overlays/ServiceConnectivityResourcesOverlay/Android.bp
@@ -0,0 +1,23 @@
+//
+// Copyright (C) 2022 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.
+//
+
+runtime_resource_overlay {
+    name: "ServiceConnectivityResourcesConfigOverlay",
+    sdk_version: "current",
+    resource_dirs: ["res"],
+    product_specific: true,
+}
+
diff --git a/rro_overlays/ServiceConnectivityResourcesOverlay/AndroidManifest.xml b/rro_overlays/ServiceConnectivityResourcesOverlay/AndroidManifest.xml
new file mode 100644
index 00000000..9887008e
--- /dev/null
+++ b/rro_overlays/ServiceConnectivityResourcesOverlay/AndroidManifest.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * Copyright (C) 2022 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.
+ */
+-->
+<!-- Manifest for connectivity resources APK -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.android.connectivity.resources.celadon"
+          android:versionCode="1"
+          android:versionName="1.0">
+    <application android:hasCode="false" />
+     <overlay
+      android:targetPackage="com.android.connectivity.resources"
+      android:targetName="ServiceConnectivityResourcesConfig"
+      android:isStatic="true"
+      android:priority="0"/>    
+</manifest>
diff --git a/rro_overlays/ServiceConnectivityResourcesOverlay/res/values/config.xml b/rro_overlays/ServiceConnectivityResourcesOverlay/res/values/config.xml
new file mode 100644
index 00000000..c3089be5
--- /dev/null
+++ b/rro_overlays/ServiceConnectivityResourcesOverlay/res/values/config.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2022 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+
+    <!-- Default supported concurrent socket keepalive slots per transport type, used by
+         ConnectivityManager.createSocketKeepalive() for calculating the number of keepalive
+         offload slots that should be reserved for privileged access. This string array should be
+         overridden by the device to present the capability of creating socket keepalives. -->
+    <!-- An Array of "[NetworkCapabilities.TRANSPORT_*],[supported keepalives] -->
+    <string-array translatable="false" name="config_networkSupportedKeepaliveCount">
+    </string-array>
+
+</resources>

From 478f0ec4bb1b5df15e157add0287780684190d2a Mon Sep 17 00:00:00 2001
From: Bing Xu <bing.xu@intel.com>
Date: Thu, 25 May 2023 13:42:00 +0800
Subject: [PATCH 2/2] Configure rro overlay for overriding
 captive_portal_http_url

Tracked-On: OAM-109946
Signed-off-by: Bing Xu <bing.xu@intel.com>
Signed-off-by: Austin Sun <austin.sun@intel.com>
---
 rro_overlays/NetworkOverlay/Android.bp        | 22 ++++++++++++++++
 .../NetworkOverlay/AndroidManifest.xml        | 11 ++++++++
 .../NetworkOverlay/res/values/config.xml      | 25 +++++++++++++++++++
 3 files changed, 58 insertions(+)
 create mode 100644 rro_overlays/NetworkOverlay/Android.bp
 create mode 100644 rro_overlays/NetworkOverlay/AndroidManifest.xml
 create mode 100644 rro_overlays/NetworkOverlay/res/values/config.xml

diff --git a/rro_overlays/NetworkOverlay/Android.bp b/rro_overlays/NetworkOverlay/Android.bp
new file mode 100644
index 00000000..92e315a9
--- /dev/null
+++ b/rro_overlays/NetworkOverlay/Android.bp
@@ -0,0 +1,22 @@
+//
+// Copyright (C) 2020 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.
+//
+
+runtime_resource_overlay {
+    name: "NetworkConfigOverlay",
+    resource_dirs: ["res"],
+    product_specific: true,
+    sdk_version: "current",
+}
diff --git a/rro_overlays/NetworkOverlay/AndroidManifest.xml b/rro_overlays/NetworkOverlay/AndroidManifest.xml
new file mode 100644
index 00000000..26b87960
--- /dev/null
+++ b/rro_overlays/NetworkOverlay/AndroidManifest.xml
@@ -0,0 +1,11 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.networkstack.celadon"
+    android:versionCode="1"
+    android:versionName="1.0">
+    <application android:hasCode="false" />
+    <overlay
+      android:targetPackage="com.android.networkstack"
+      android:isStatic="true"
+      android:targetName="NetworkStackConfig"
+      android:priority="0"/>
+</manifest>
diff --git a/rro_overlays/NetworkOverlay/res/values/config.xml b/rro_overlays/NetworkOverlay/res/values/config.xml
new file mode 100644
index 00000000..feff7b73
--- /dev/null
+++ b/rro_overlays/NetworkOverlay/res/values/config.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2020, 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!--suppress CheckTagEmptyBody: overlayable resource to use as configuration hook -->
+    <string name="config_captive_portal_http_url" translatable="false">http://connect.rom.miui.com/generate_204</string>
+    <!--suppress CheckTagEmptyBody: overlayable resource to use as configuration hook -->
+    <string name="config_captive_portal_https_url" translatable="false">https://connect.rom.miui.com/generate_204</string>
+</resources>