Merge changes from topics "area_info_refactor", "dbgf_test"
* changes:
Added device-based geo-fencing debug info support
Refactored cell broadcast area info support
diff --git a/RROSampleTestApp/Android.bp b/RROSampleTestApp/Android.bp
new file mode 100644
index 0000000..64f5164
--- /dev/null
+++ b/RROSampleTestApp/Android.bp
@@ -0,0 +1,4 @@
+runtime_resource_overlay {
+ name: "CellBroadcastReceiverRROSample",
+ product_specific: true,
+}
diff --git a/RROSampleTestApp/Android.mk b/RROSampleTestApp/Android.mk
deleted file mode 100644
index 6407884..0000000
--- a/RROSampleTestApp/Android.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# 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.
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-LOCAL_PACKAGE_NAME := CellBroadcastReceiverRROSample
-LOCAL_PRODUCT_MODULE := true
-LOCAL_SDK_VERSION := current
-include $(BUILD_RRO_PACKAGE)
\ No newline at end of file
diff --git a/res/values-mcc001/config.xml b/res/values-mcc001/config.xml
deleted file mode 100644
index dbc2d0d..0000000
--- a/res/values-mcc001/config.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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.
--->
-
-<resources>
- <!-- Whether to reset alert message duplicate detection and geo-fencing check after
- reboot or toggling airplane mode -->
- <bool name="reset_on_power_cycle_or_airplane_mode">true</bool>
-</resources>
\ No newline at end of file
