From 4211f1d2d76e465d28ef8acea6ccedb95b5b1a96 Mon Sep 17 00:00:00 2001
From: Erfan Abdi <erfangplus@gmail.com>
Date: Thu, 16 Dec 2021 01:14:16 +0330
Subject: [PATCH] sm8350-common: Drop TetheringConfig rro
---
common.mk | 4 -
rro_overlays/TetheringOverlay/Android.bp | 23 ------
.../TetheringOverlay/AndroidManifest.xml | 11 ---
.../TetheringOverlay/res/values/config.xml | 76 -------------------
4 files changed, 114 deletions(-)
delete mode 100644 rro_overlays/TetheringOverlay/Android.bp
delete mode 100644 rro_overlays/TetheringOverlay/AndroidManifest.xml
delete mode 100644 rro_overlays/TetheringOverlay/res/values/config.xml
diff --git a/common.mk b/common.mk
index 7f0b094..ef19973 100644
--- a/common.mk
+++ b/common.mk
@@ -393,10 +393,6 @@ PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.telephony.cdma.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.telephony.cdma.xml \
frameworks/native/data/etc/android.software.sip.voip.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.sip.voip.xml
-# Tethering
-PRODUCT_PACKAGES += \
- TetheringConfigOverlay
-
# Thermal
PRODUCT_PACKAGES += \
android.hardware.thermal@2.0-service.qti
diff --git a/rro_overlays/TetheringOverlay/Android.bp b/rro_overlays/TetheringOverlay/Android.bp
deleted file mode 100644
index d6ea4da..0000000
--- a/rro_overlays/TetheringOverlay/Android.bp
+++ /dev/null
@@ -1,23 +0,0 @@
-//
-// 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: "TetheringConfigOverlay",
- theme: "TetheringConfigOverlay",
- certificate: "platform",
- sdk_version: "current",
- product_specific: true
-}
diff --git a/rro_overlays/TetheringOverlay/AndroidManifest.xml b/rro_overlays/TetheringOverlay/AndroidManifest.xml
deleted file mode 100644
index f903fc9..0000000
--- a/rro_overlays/TetheringOverlay/AndroidManifest.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.networkstack.tethering.xiaomi_sm8350"
- android:versionCode="1"
- android:versionName="1.0">
- <application android:hasCode="false" />
- <overlay
- android:targetPackage="com.android.networkstack.tethering"
- android:targetName="TetheringConfig"
- android:isStatic="true"
- android:priority="0"/>
-</manifest>
diff --git a/rro_overlays/TetheringOverlay/res/values/config.xml b/rro_overlays/TetheringOverlay/res/values/config.xml
deleted file mode 100644
index c58d828..0000000
--- a/rro_overlays/TetheringOverlay/res/values/config.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?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">
- <!-- List of regexpressions describing the interface (if any) that represent tetherable
- USB interfaces. If the device doesn't want to support tething over USB this should
- be empty. An example would be "usb.*" -->
- <string-array name="config_tether_usb_regexs">
- <item>"usb\\d"</item>
- <item>"rndis\\d"</item>
- </string-array>
-
- <!-- List of regexpressions describing the interface (if any) that represent tetherable
- Wifi interfaces. If the device doesn't want to support tethering over Wifi this
- should be empty. An example would be "softap.*" -->
- <string-array name="config_tether_wifi_regexs">
- <item>"softap0"</item>
- <item>"wlan\\d"</item>
- </string-array>
-
- <!-- List of regexpressions describing the interface (if any) that represent tetherable
- bluetooth interfaces. If the device doesn't want to support tethering over bluetooth this
- should be empty. -->
- <string-array name="config_tether_bluetooth_regexs">
- <item>"bnep\\d"</item>
- <item>"bt-pan"</item>
- </string-array>
-
- <!-- Dhcp range (min, max) to use for tethering purposes -->
- <!-- USB is 192.168.42.1 and 255.255.255.0
- Wifi is 192.168.43.1 and 255.255.255.0
- BT is limited to max default of 5 connections. 192.168.44.1 to 192.168.48.1
- with 255.255.255.0
- P2P is 192.168.49.1 and 255.255.255.0
- Wigig is 192.168.50.1 and 255.255.255.0
- Wigig P2P is 192.168.51.1 and 255.255.255.0
- -->
- <string-array name="config_tether_dhcp_range">
- <item>192.168.42.2</item>
- <item>192.168.42.254</item>
- <item>192.168.43.2</item>
- <item>192.168.43.254</item>
- <item>192.168.44.2</item>
- <item>192.168.44.254</item>
- <item>192.168.45.2</item>
- <item>192.168.45.254</item>
- <item>192.168.46.2</item>
- <item>192.168.46.254</item>
- <item>192.168.47.2</item>
- <item>192.168.47.254</item>
- <item>192.168.48.2</item>
- <item>192.168.48.254</item>
- <item>192.168.49.2</item>
- <item>192.168.49.254</item>
- <item>192.168.50.2</item>
- <item>192.168.50.254</item>
- <item>192.168.51.2</item>
- <item>192.168.51.254</item>
- </string-array>
-</resources>
--
GitLab