Merge "omni: update init.local.rc" into android-6.0
diff --git a/config/common.mk b/config/common.mk
index ef1b072..d5a4841 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -36,6 +36,10 @@
vendor/omni/prebuilt/bin/50-hosts.sh:system/addon.d/50-hosts.sh \
vendor/omni/prebuilt/bin/blacklist:system/addon.d/blacklist
+# Backup Services whitelist
+PRODUCT_COPY_FILES += \
+ vendor/omni/prebuilt/etc/sysconfig/backup.xml:system/etc/sysconfig/backup.xml
+
# init.d support
PRODUCT_COPY_FILES += \
vendor/omni/prebuilt/etc/init.d/00banner:system/etc/init.d/00banner \
diff --git a/prebuilt/etc/sysconfig/backup.xml b/prebuilt/etc/sysconfig/backup.xml
new file mode 100644
index 0000000..5ca0abc
--- /dev/null
+++ b/prebuilt/etc/sysconfig/backup.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 The CyanogenMod 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.
+-->
+<config>
+ <!-- Whitelist of what components are permitted as backup data transports. The
+ 'service' attribute here is a flattened ComponentName string. -->
+ <backup-transport-whitelisted-service
+ service="android/com.android.internal.backup.LocalTransportService" />
+ <backup-transport-whitelisted-service
+ service="com.google.android.gms/.backup.BackupTransportService" />
+ <backup-transport-whitelisted-service
+ service="com.google.android.gms/.backup.component.D2dTransportService" />
+</config>
+