From e7d73c4738b8ebdb3c297a082e62299a66ddf229 Mon Sep 17 00:00:00 2001 From: SGCMarkus Date: Sat, 16 Sep 2023 00:36:41 +0200 Subject: [PATCH] sm7325-common: remove CarrierConfig overlay This is now generated by extract script in device tree Change-Id: Ife7b35b51d5af5c84fa7f40f31de890e2b22aa23 --- common.mk | 1 - .../common/CarrierConfig/Android.bp | 10 - .../common/CarrierConfig/AndroidManifest.xml | 9 - resource-overlay/common/CarrierConfig/NOTICE | 50 - .../common/CarrierConfig/res/xml/vendor.xml | 2604 ----------------- 5 files changed, 2674 deletions(-) delete mode 100644 resource-overlay/common/CarrierConfig/Android.bp delete mode 100644 resource-overlay/common/CarrierConfig/AndroidManifest.xml delete mode 100644 resource-overlay/common/CarrierConfig/NOTICE delete mode 100644 resource-overlay/common/CarrierConfig/res/xml/vendor.xml diff --git a/common.mk b/common.mk index 8d5de38..5ababb4 100644 --- a/common.mk +++ b/common.mk @@ -30,7 +30,6 @@ PRODUCT_ENFORCE_RRO_TARGETS := * PRODUCT_PACKAGES += \ FrameworksResCommon_Sys \ - CarrierConfigResCommon_Sys \ SystemUIResCommon_Sys \ TelecommResCommon_Sys \ TelephonyResCommon_Sys \ diff --git a/resource-overlay/common/CarrierConfig/Android.bp b/resource-overlay/common/CarrierConfig/Android.bp deleted file mode 100644 index df1a2c2..0000000 --- a/resource-overlay/common/CarrierConfig/Android.bp +++ /dev/null @@ -1,10 +0,0 @@ -// -// SPDX-FileCopyrightText: 2024-2025 The LineageOS Project -// SPDX-License-Identifier: Apache-2.0 -// - -runtime_resource_overlay { - name: "CarrierConfigResCommon_Sys", - aaptflags: ["--keep-raw-values"], - product_specific: true, -} diff --git a/resource-overlay/common/CarrierConfig/AndroidManifest.xml b/resource-overlay/common/CarrierConfig/AndroidManifest.xml deleted file mode 100644 index bf04f5a..0000000 --- a/resource-overlay/common/CarrierConfig/AndroidManifest.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/resource-overlay/common/CarrierConfig/NOTICE b/resource-overlay/common/CarrierConfig/NOTICE deleted file mode 100644 index 092b509..0000000 --- a/resource-overlay/common/CarrierConfig/NOTICE +++ /dev/null @@ -1,50 +0,0 @@ -This NOTICE file contains certain notices of software components included -with the software that Qualcomm Technologies, Inc. ("Qualcomm Technologies") -is required to provide you. Notwithstanding anything in the notices in this -file, your use of these software components together with the -Qualcomm Technologies software (Qualcomm Technologies software hereinafter -referred to as "Software") is subject to the terms of your license from -Qualcomm Technologies. Compliance with all copyright laws and software -license agreements included in the notice section of this file are the -responsibility of the user. Except as may be granted by separate express -written agreement, this file provides no license to any patents, -trademarks, copyrights, or other intellectual property. - -Copyright (c) 2018 Qualcomm Technologies, Inc. -All rights reserved. -Qualcomm is a registered trademark and registered service mark of -QUALCOMM Incorporated. All other trademarks and service marks are the -property of their respective owners. -________________________________________ -NOTICES -________________________________________ - -Copyright (c) 2014-2018 The Linux Foundation. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted (subject to the limitations in the -disclaimer below) provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above - copyright notice, this list of conditions and the following - disclaimer in the documentation and/or other materials provided - with the distribution. - * Neither the name of the Linux Foundation nor the names of its - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - -NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE -GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT -HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED -WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR -BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/resource-overlay/common/CarrierConfig/res/xml/vendor.xml b/resource-overlay/common/CarrierConfig/res/xml/vendor.xml deleted file mode 100644 index aa5796d..0000000 --- a/resource-overlay/common/CarrierConfig/res/xml/vendor.xml +++ /dev/null @@ -1,2604 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - com.example.android.locationattribution - - - - - - - connected_mmwave:5GUWB,connected:5g,not_restricted:None,restricted:None - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IPV4V6 - IPV4V6 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IPV4V6 - IPV4V6 - - - - - - - - - - - - - - - - - - - IPV4V6 - IPV4V6 - - - - - - - - - - - - - - - - - - - - - - - - - - - - IPV4V6 - IPV4V6 - - - - - - - - - - - - - - - - - - - - - - - China Mobile - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IPV4V6 - IPV4V6 - - - - - - China Unicom - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IPV4V6 - IPV4V6 - - - - - - - - - - - - - - - - - - - - - - - China Mobile - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IPV4V6 - IPV4V6 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IPV4V6 - IPV4V6 - - - - - - - - - - IPV4V6 - IPV4V6 - - - - - - - - - - - - - - - - - - - - - - - - IPV4V6 - IPV4V6 - - - - - - China Unicom - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IPV4V6 - IPV4V6 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IPV4V6 - IPV4V6 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IPV4V6 - IPV4V6 - - - - - - China Unicom - - - - - - - - - - - - - - - - - - - IPV4V6 - IPV4V6 - - - - - - - - - - - - - - - - - - IPV4V6 - IPV4V6 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IPV4V6 - IPV4V6 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -