Merge "vendor: Add missing call to Bliss System Permissions" into q10
diff --git a/build/core/config.mk b/build/core/config.mk
index 901cadc..8a52b43 100644
--- a/build/core/config.mk
+++ b/build/core/config.mk
@@ -20,7 +20,5 @@
FRAMEWORK_LINEAGE_PLATFORM_REMOVED_API_FILE := $(TOPDIR)lineage-sdk/api/lineage_removed.txt
FRAMEWORK_LINEAGE_API_NEEDS_UPDATE_TEXT := $(TOPDIR)vendor/bliss/build/core/apicheck_msg_current.txt
-BUILD_RRO_SYSTEM_PACKAGE := $(TOPDIR)vendor/bliss/build/core/system_rro.mk
-
# Rules for QCOM targets
include $(TOPDIR)vendor/bliss/build/core/qcom_target.mk
diff --git a/build/core/system_rro.mk b/build/core/system_rro.mk
deleted file mode 100644
index 9b1257a..0000000
--- a/build/core/system_rro.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright (C) 2018 The LineageOS 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_IS_RUNTIME_RESOURCE_OVERLAY := true
-
-ifneq ($(LOCAL_SRC_FILES),)
- $(error runtime resource overlay package should not contain sources)
-endif
-
-ifeq ($(LOCAL_RRO_THEME),)
- $(error runtime resource overlay package must define \'LOCAL_RRO_THEME\')
-else
- LOCAL_MODULE_PATH := $(TARGET_OUT)/app/$(LOCAL_RRO_THEME)
-endif
-
-include $(BUILD_SYSTEM)/package.mk
-
diff --git a/config/lineage_sdk_common.mk b/config/lineage_sdk_common.mk
index 36c8940..ec92db5 100644
--- a/config/lineage_sdk_common.mk
+++ b/config/lineage_sdk_common.mk
@@ -6,7 +6,6 @@
vendor/bliss/config/permissions/org.lineageos.performance.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/org.lineageos.performance.xml \
vendor/bliss/config/permissions/org.lineageos.profiles.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/org.lineageos.profiles.xml \
vendor/bliss/config/permissions/org.lineageos.settings.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/org.lineageos.settings.xml \
- vendor/bliss/config/permissions/org.lineageos.style.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/org.lineageos.style.xml \
vendor/bliss/config/permissions/org.lineageos.trust.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/org.lineageos.trust.xml \
vendor/bliss/config/permissions/org.lineageos.weather.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/org.lineageos.weather.xml
diff --git a/config/permissions/org.lineageos.style.xml b/config/permissions/org.lineageos.style.xml
deleted file mode 100644
index d039fce..0000000
--- a/config/permissions/org.lineageos.style.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2018 The LineageOS 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.
--->
-
-<permissions>
- <!-- The feature listed here coincides with the StyleInterfaceService declared as
- part of the external lineage service init in SystemServer. If this xml isn't present
- on the device, the service will not be published as a binder service!
- -->
- <feature name="org.lineageos.style" />
-</permissions>
diff --git a/config/permissions/privapp-permissions-lineage-system.xml b/config/permissions/privapp-permissions-lineage-system.xml
index db4c985..bc2f696 100644
--- a/config/permissions/privapp-permissions-lineage-system.xml
+++ b/config/permissions/privapp-permissions-lineage-system.xml
@@ -40,7 +40,6 @@
<privapp-permissions package="org.lineageos.lineageparts">
<permission name="android.permission.CHANGE_CONFIGURATION"/>
- <permission name="android.permission.CHANGE_OVERLAY_PACKAGES"/>
<permission name="android.permission.READ_SEARCH_INDEXABLES"/>
<permission name="android.permission.WRITE_MEDIA_STORAGE"/>
<permission name="android.permission.WRITE_SECURE_SETTINGS"/>