From ad848463d60cb96ee78e8a0bf8de2ad1db50d20f Mon Sep 17 00:00:00 2001
From: Evan Anderson <evan@aospa.co>
Date: Tue, 23 May 2023 05:36:30 +0900
Subject: [PATCH] aospa: Disable GBK in Wi-Fi overlay for all targets

This feature is used for character encoding in China,
but is breaking Wi-Fi connections in the new
GMS Setup Wizard. AOSP does not support this
feature, so disable for now.

Change-Id: Id400484e507ceb68caa595a0f2c839d515db5e32
---
 overlay/AOSPAWifiOverlay/Android.bp           | 18 +++++++++++++
 overlay/AOSPAWifiOverlay/AndroidManifest.xml  | 26 +++++++++++++++++++
 .../AOSPAWifiOverlay/res/values/config.xml    | 21 +++++++++++++++
 overlay/overlays.mk                           |  3 ++-
 4 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 overlay/AOSPAWifiOverlay/Android.bp
 create mode 100644 overlay/AOSPAWifiOverlay/AndroidManifest.xml
 create mode 100644 overlay/AOSPAWifiOverlay/res/values/config.xml

diff --git a/overlay/AOSPAWifiOverlay/Android.bp b/overlay/AOSPAWifiOverlay/Android.bp
new file mode 100644
index 00000000..508380cb
--- /dev/null
+++ b/overlay/AOSPAWifiOverlay/Android.bp
@@ -0,0 +1,18 @@
+// Copyright (C) 2023 Paranoid Android
+//
+// 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: "AOSPAWifiOverlay",
+    product_specific: true,
+}
diff --git a/overlay/AOSPAWifiOverlay/AndroidManifest.xml b/overlay/AOSPAWifiOverlay/AndroidManifest.xml
new file mode 100644
index 00000000..671b79d4
--- /dev/null
+++ b/overlay/AOSPAWifiOverlay/AndroidManifest.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2023 Paranoid Android
+
+     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.wifi.resources.aospa.overlay">
+
+    <application android:hasCode="false"/>
+
+    <overlay
+        android:isStatic="true"
+        android:priority="750"
+        android:targetPackage="com.android.wifi.resources"
+        android:targetName="WifiCustomization" />
+</manifest>
diff --git a/overlay/AOSPAWifiOverlay/res/values/config.xml b/overlay/AOSPAWifiOverlay/res/values/config.xml
new file mode 100644
index 00000000..eca13a31
--- /dev/null
+++ b/overlay/AOSPAWifiOverlay/res/values/config.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2023 Paranoid Android
+
+     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>
+
+    <!-- Indicate ssid coding from unquoted hexadecimal to gbk character is supported on this device. -->
+    <bool translatable="false" name="config_vendor_wifi_gbk_ssid_supported">false</bool>
+
+</resources>
diff --git a/overlay/overlays.mk b/overlay/overlays.mk
index 9196e4ac..0b7b9734 100644
--- a/overlay/overlays.mk
+++ b/overlay/overlays.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2021 Paranoid Android
+# Copyright (C) 2023 Paranoid Android
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@ PRODUCT_PACKAGES += \
     AOSPASettingsOverlay \
     AOSPASettingsProviderOverlay \
     AOSPASystemUIOverlay \
+    AOSPAWifiOverlay \
     FontGoogleSansLatoOverlay \
     FontHarmonySansOverlay \
     FontInterOverlay \