From a9988f304cc0f08a966aafb1a4bf9ebb50251107 Mon Sep 17 00:00:00 2001
From: Chirayu Desai <chirayudesai1@gmail.com>
Date: Thu, 15 Apr 2021 02:09:34 +0530
Subject: [PATCH] sm6150-common: rro_overlays: Move CarrierConfig to RRO

Change-Id: Ia57acd244608848f70fdcc30d5694c919db60671
---
 rro_overlays/CarrierConfigOverlay/Android.bp  |  7 +++++
 .../CarrierConfigOverlay/AndroidManifest.xml  | 26 +++++++++++++++++++
 .../CarrierConfigOverlay}/res/xml/vendor.xml  |  0
 sm6150.mk                                     |  1 +
 4 files changed, 34 insertions(+)
 create mode 100644 rro_overlays/CarrierConfigOverlay/Android.bp
 create mode 100644 rro_overlays/CarrierConfigOverlay/AndroidManifest.xml
 rename {overlay/packages/apps/CarrierConfig => rro_overlays/CarrierConfigOverlay}/res/xml/vendor.xml (100%)

diff --git a/rro_overlays/CarrierConfigOverlay/Android.bp b/rro_overlays/CarrierConfigOverlay/Android.bp
new file mode 100644
index 0000000..8864ba7
--- /dev/null
+++ b/rro_overlays/CarrierConfigOverlay/Android.bp
@@ -0,0 +1,7 @@
+runtime_resource_overlay {
+    name: "CarrierConfigOverlay",
+    theme: "CarrierConfigOverlay",
+    sdk_version: "current",
+    product_specific: true,
+    aaptflags: ["--keep-raw-values"],
+}
diff --git a/rro_overlays/CarrierConfigOverlay/AndroidManifest.xml b/rro_overlays/CarrierConfigOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..c1b1ae1
--- /dev/null
+++ b/rro_overlays/CarrierConfigOverlay/AndroidManifest.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2019 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.
+-->
+<!-- Xiaomi sm6150 specific carrier overlays -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.carrierconfig.xiaomi_sm6150"
+    android:versionCode="1"
+    android:versionName="1.0">
+    <application android:hasCode="false" />
+    <overlay
+      android:targetPackage="com.android.carrierconfig"
+      android:isStatic="true"
+      android:priority="0"/>
+</manifest>
diff --git a/overlay/packages/apps/CarrierConfig/res/xml/vendor.xml b/rro_overlays/CarrierConfigOverlay/res/xml/vendor.xml
similarity index 100%
rename from overlay/packages/apps/CarrierConfig/res/xml/vendor.xml
rename to rro_overlays/CarrierConfigOverlay/res/xml/vendor.xml
diff --git a/sm6150.mk b/sm6150.mk
index a8281d1..fcb0d65 100644
--- a/sm6150.mk
+++ b/sm6150.mk
@@ -266,6 +266,7 @@ PRODUCT_COPY_FILES += \
 
 # RIL
 PRODUCT_PACKAGES += \
+    CarrierConfigOverlay \
     libjson \
     libril \
     librilutils \