From 3f866d1f9b6fb349586cdd6430fccea5aa6e3685 Mon Sep 17 00:00:00 2001
From: Alcatraz323 <alcatraz32323@gmail.com>
Date: Sun, 10 Mar 2024 14:51:50 +0800
Subject: [PATCH] sdm660-common: move RIL related config to specific overlay

---
 .../res/values/config.xml                     | 41 ++++++---
 .../SDM660RILFrameworksOverlay/Android.bp     | 21 +++++
 .../AndroidManifest.xml                       | 21 +++++
 .../res/values/config.xml                     | 85 +++++++++++++++++++
 .../SDM660RILSettingsOverlay/Android.bp       | 21 +++++
 .../AndroidManifest.xml                       | 21 +++++
 .../res/values/config.xml                     | 17 ++++
 .../res/values/config.xml                     | 16 ++++
 sdm660.mk                                     |  2 +
 9 files changed, 233 insertions(+), 12 deletions(-)
 create mode 100644 rro_overlay/SDM660RILFrameworksOverlay/Android.bp
 create mode 100644 rro_overlay/SDM660RILFrameworksOverlay/AndroidManifest.xml
 create mode 100644 rro_overlay/SDM660RILFrameworksOverlay/res/values/config.xml
 create mode 100644 rro_overlay/SDM660RILSettingsOverlay/Android.bp
 create mode 100644 rro_overlay/SDM660RILSettingsOverlay/AndroidManifest.xml
 create mode 100644 rro_overlay/SDM660RILSettingsOverlay/res/values/config.xml
 create mode 100644 rro_overlay/SDM660SettingsOverlay/res/values/config.xml

diff --git a/rro_overlay/SDM660FrameworksOverlay/res/values/config.xml b/rro_overlay/SDM660FrameworksOverlay/res/values/config.xml
index d1c29940..739c9b84 100644
--- a/rro_overlay/SDM660FrameworksOverlay/res/values/config.xml
+++ b/rro_overlay/SDM660FrameworksOverlay/res/values/config.xml
@@ -798,6 +798,35 @@
     <!-- Should the pinner service pin the Home application? -->
     <bool name="config_pinnerHomeApp">true</bool>
 
+    <!-- Flag indicating whether the current device is "voice capable".
+         If true, this means that the device supports circuit-switched
+         (i.e. voice) phone calls over the telephony network, and is
+         allowed to display the in-call UI while a cellular voice call is
+         active.  This can be overridden to false for "data only" devices
+         which can't make voice calls and don't support any in-call UI.
+
+         Note: this flag is subtly different from the
+         PackageManager.FEATURE_TELEPHONY system feature, which is
+         available on *any* device with a telephony radio, even if the
+         device is data-only. -->
+    <bool name="config_voice_capable">false</bool>
+
+    <!-- Flag indicating whether the current device allows sms service.
+         If true, this means that the device supports both sending and
+         receiving sms via the telephony network.
+         This can be overridden to false for "data only" devices
+         which can't send and receive sms message.
+
+         Note: Disable SMS also disable voicemail waiting sms,
+               cell broadcasting sms, and MMS. -->
+    <bool name="config_sms_capable">false</bool>
+
+    <!-- Flag indicating whether the current device allows data.
+         If true, this means that the device supports data connectivity through
+         the telephony network.
+         This can be overridden to false for devices that support voice and/or sms . -->
+    <bool name="config_mobile_data_capable">false</bool>
+
     <!-- This string array should be overridden by the device to present a list of network
          attributes.  This is used by the connectivity manager to decide which networks can coexist
          based on the hardware -->
@@ -809,16 +838,7 @@
     <!-- the 6th element indicates boot-time dependency-met value. -->
     <string-array translatable="false" name="networkAttributes">
         <item>"wifi,1,1,1,-1,true"</item>
-        <item>"mobile,0,0,0,-1,true"</item>
-        <item>"mobile_mms,2,0,4,60000,true"</item>
-        <item>"mobile_supl,3,0,2,60000,true"</item>
-        <item>"mobile_dun,4,0,2,60000,true"</item>
-        <item>"mobile_hipri,5,0,3,60000,true"</item>
-        <item>"mobile_fota,10,0,2,60000,true"</item>
-        <item>"mobile_ims,11,0,2,60000,true"</item>
-        <item>"mobile_cbs,12,0,2,60000,true"</item>
         <item>"bluetooth,7,7,2,-1,true"</item>
-        <item>"mobile_emergency,15,0,5,-1,true"</item>
         <item>"ethernet,9,9,9,-1,true"</item>
     </string-array>
 
@@ -830,11 +850,8 @@
     <string-array translatable="false" name="radioAttributes">
         <item>"1,1"</item>
         <item>"0,1"</item>
-        <item>"7,1"</item>
-        <item>"9,1"</item>
     </string-array>
 
-
     <!-- Configure mobile tcp buffer sizes in the form:
          rat-name:rmem_min,rmem_def,rmem_max,wmem_min,wmem_def,wmem_max
          If no value is found for the rat-name in use, the system default will be applied.
diff --git a/rro_overlay/SDM660RILFrameworksOverlay/Android.bp b/rro_overlay/SDM660RILFrameworksOverlay/Android.bp
new file mode 100644
index 00000000..7ee7ff3e
--- /dev/null
+++ b/rro_overlay/SDM660RILFrameworksOverlay/Android.bp
@@ -0,0 +1,21 @@
+//
+// Copyright (C) 2022 PixelExperience
+//
+// 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: "SDM660RILFrameworksOverlay",
+    resource_dirs: ["res"],
+    vendor: true,
+}
diff --git a/rro_overlay/SDM660RILFrameworksOverlay/AndroidManifest.xml b/rro_overlay/SDM660RILFrameworksOverlay/AndroidManifest.xml
new file mode 100644
index 00000000..fae0424b
--- /dev/null
+++ b/rro_overlay/SDM660RILFrameworksOverlay/AndroidManifest.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 PixelExpereince
+     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 xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.frameworks.overlay.sdm660ril">
+
+    <application android:hasCode="false" />
+    <overlay
+      android:targetPackage="android"
+      android:isStatic="true"
+      android:priority="2"/>
+</manifest>
diff --git a/rro_overlay/SDM660RILFrameworksOverlay/res/values/config.xml b/rro_overlay/SDM660RILFrameworksOverlay/res/values/config.xml
new file mode 100644
index 00000000..644bd0ce
--- /dev/null
+++ b/rro_overlay/SDM660RILFrameworksOverlay/res/values/config.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2023, 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">
+    <!-- Flag indicating whether the current device is "voice capable".
+         If true, this means that the device supports circuit-switched
+         (i.e. voice) phone calls over the telephony network, and is
+         allowed to display the in-call UI while a cellular voice call is
+         active.  This can be overridden to false for "data only" devices
+         which can't make voice calls and don't support any in-call UI.
+
+         Note: this flag is subtly different from the
+         PackageManager.FEATURE_TELEPHONY system feature, which is
+         available on *any* device with a telephony radio, even if the
+         device is data-only. -->
+    <bool name="config_voice_capable">true</bool>
+
+    <!-- Flag indicating whether the current device allows sms service.
+         If true, this means that the device supports both sending and
+         receiving sms via the telephony network.
+         This can be overridden to false for "data only" devices
+         which can't send and receive sms message.
+
+         Note: Disable SMS also disable voicemail waiting sms,
+               cell broadcasting sms, and MMS. -->
+    <bool name="config_sms_capable">true</bool>
+
+    <!-- Flag indicating whether the current device allows data.
+         If true, this means that the device supports data connectivity through
+         the telephony network.
+         This can be overridden to false for devices that support voice and/or sms . -->
+    <bool name="config_mobile_data_capable">true</bool>
+
+    <!-- This string array should be overridden by the device to present a list of network
+         attributes.  This is used by the connectivity manager to decide which networks can coexist
+         based on the hardware -->
+    <!-- An Array of "[Connection name],[ConnectivityManager.TYPE_xxxx],
+         [associated radio-type],[priority],[restoral-timer(ms)],[dependencyMet]  -->
+    <!-- the 5th element "resore-time" indicates the number of milliseconds to delay
+         before automatically restore the default connection.  Set -1 if the connection
+         does not require auto-restore. -->
+    <!-- the 6th element indicates boot-time dependency-met value. -->
+    <string-array translatable="false" name="networkAttributes">
+        <item>"wifi,1,1,1,-1,true"</item>
+        <item>"mobile,0,0,0,-1,true"</item>
+        <item>"mobile_mms,2,0,4,60000,true"</item>
+        <item>"mobile_supl,3,0,2,60000,true"</item>
+        <item>"mobile_dun,4,0,2,60000,true"</item>
+        <item>"mobile_hipri,5,0,3,60000,true"</item>
+        <item>"mobile_fota,10,0,2,60000,true"</item>
+        <item>"mobile_ims,11,0,2,60000,true"</item>
+        <item>"mobile_cbs,12,0,2,60000,true"</item>
+        <item>"bluetooth,7,7,2,-1,true"</item>
+        <item>"mobile_emergency,15,0,5,-1,true"</item>
+        <item>"ethernet,9,9,9,-1,true"</item>
+    </string-array>
+
+    <!-- This string array should be overridden by the device to present a list of radio
+         attributes.  This is used by the connectivity manager to decide which networks can coexist
+         based on the hardware -->
+    <!-- An Array of "[ConnectivityManager connectionType],
+                      [# simultaneous connection types]"  -->
+    <string-array translatable="false" name="radioAttributes">
+        <item>"1,1"</item>
+        <item>"0,1"</item>
+        <item>"7,1"</item>
+        <item>"9,1"</item>
+    </string-array>
+</resources>
\ No newline at end of file
diff --git a/rro_overlay/SDM660RILSettingsOverlay/Android.bp b/rro_overlay/SDM660RILSettingsOverlay/Android.bp
new file mode 100644
index 00000000..0dfbd82f
--- /dev/null
+++ b/rro_overlay/SDM660RILSettingsOverlay/Android.bp
@@ -0,0 +1,21 @@
+//
+// Copyright (C) 2022 PixelExperience
+//
+// 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: "SDM660RILSettingsOverlay",
+    resource_dirs: ["res"],
+    vendor: true,
+}
diff --git a/rro_overlay/SDM660RILSettingsOverlay/AndroidManifest.xml b/rro_overlay/SDM660RILSettingsOverlay/AndroidManifest.xml
new file mode 100644
index 00000000..8aea4968
--- /dev/null
+++ b/rro_overlay/SDM660RILSettingsOverlay/AndroidManifest.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 PixelExpereince
+     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 xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.settings.overlay.sdm660ril">
+
+    <application android:hasCode="false" />
+    <overlay
+      android:targetPackage="android"
+      android:isStatic="true"
+      android:priority="2"/>
+</manifest>
diff --git a/rro_overlay/SDM660RILSettingsOverlay/res/values/config.xml b/rro_overlay/SDM660RILSettingsOverlay/res/values/config.xml
new file mode 100644
index 00000000..104148ff
--- /dev/null
+++ b/rro_overlay/SDM660RILSettingsOverlay/res/values/config.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 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">
+    <!-- Whether sim related information is visible to the end user. -->
+    <bool name="config_show_sim_info">true</bool>
+</resources>
\ No newline at end of file
diff --git a/rro_overlay/SDM660SettingsOverlay/res/values/config.xml b/rro_overlay/SDM660SettingsOverlay/res/values/config.xml
new file mode 100644
index 00000000..8dc76bae
--- /dev/null
+++ b/rro_overlay/SDM660SettingsOverlay/res/values/config.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2023 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">
+    <!-- Whether sim related information is visible to the end user. -->
+    <bool name="config_show_sim_info">false</bool>
+</resources>
diff --git a/sdm660.mk b/sdm660.mk
index ffe7b8a5..4739c79f 100644
--- a/sdm660.mk
+++ b/sdm660.mk
@@ -390,6 +390,8 @@ PRODUCT_PACKAGES += \
     SDM660CarrierConfigOverlay \
     SDM660DialerOverlay \
     SDM660FrameworksOverlay \
+    SDM660RILFrameworksOverlay \
+    SDM660RILSettingsOverlay \
     SDM660SettingsOverlay \
     SDM660SettingsProviderOverlay \
     SDM660SystemUIOverlay \