Revert "Ship Device Personalization Services"
This reverts commit b88f77fbc61c05888a06a27556428262e2af6ada.
diff --git a/config/bliss_packages.mk b/config/bliss_packages.mk
index a9047ab..b3ec656 100644
--- a/config/bliss_packages.mk
+++ b/config/bliss_packages.mk
@@ -63,7 +63,6 @@
BlissUpdater \
BlissPapers \
SettingsIntelligenceGooglePrebuilt \
- MatchmakerPrebuilt \
NexusLauncherRelease \
NexusWallpapersStubPrebuilt2019Static \
GalleryGoPrebuilt \
diff --git a/config/common.mk b/config/common.mk
index b21feba..57676e4 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -101,8 +101,7 @@
vendor/bliss/config/permissions/org.lineageos.android.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/org.lineageos.android.xml \
vendor/bliss/config/permissions/privapp-permissions-lineage-system.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-lineage.xml \
vendor/bliss/config/permissions/privapp-permissions-lineage-product.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/privapp-permissions-lineage.xml \
- vendor/bliss/config/permissions/privapp-permissions-cm-legacy.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-cm-legacy.xml \
- vendor/bliss/config/permissions/privapp-permissions-google-product.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/privapp-permissions-google.xml
+ vendor/bliss/config/permissions/privapp-permissions-cm-legacy.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-cm-legacy.xml
# Hidden API whitelist
PRODUCT_COPY_FILES += \
diff --git a/config/permissions/privapp-permissions-google-product.xml b/config/permissions/privapp-permissions-google-product.xml
deleted file mode 100644
index 0f2cab9..0000000
--- a/config/permissions/privapp-permissions-google-product.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (C) 2017 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
- -->
-
-<!--
-This XML file declares which signature|privileged permissions should be granted to privileged
-applications on GMS or Google-branded devices.
-It allows additional grants on top of privapp-permissions-platform.xml
--->
-<permissions>
-
- <privapp-permissions package="com.google.android.as">
- <permission name="android.permission.CAPTURE_AUDIO_HOTWORD"/>
- <permission name="android.permission.CAPTURE_AUDIO_OUTPUT"/>
- <permission name="android.permission.CAPTURE_MEDIA_OUTPUT"/>
- <permission name="android.permission.CONTROL_INCALL_EXPERIENCE"/>
- <permission name="android.permission.LOCATION_HARDWARE"/>
- <permission name="android.permission.MANAGE_SOUND_TRIGGER"/>
- <permission name="android.permission.MODIFY_AUDIO_ROUTING"/>
- <permission name="android.permission.MODIFY_PHONE_STATE"/>
- <permission name="android.permission.MONITOR_DEFAULT_SMS_PACKAGE"/>
- <permission name="android.permission.PACKAGE_USAGE_STATS"/>
- <permission name="android.permission.READ_OEM_UNLOCK_STATE"/>
- <permission name="android.permission.REQUEST_NOTIFICATION_ASSISTANT_SERVICE"/>
- <permission name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>
- <permission name="android.permission.UPDATE_DEVICE_STATS"/>
- <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
- </privapp-permissions>
-
-</permissions>