From 0fd80b107ac63f848feefc442323df799187aaa0 Mon Sep 17 00:00:00 2001 From: Amit Kumar Date: Fri, 28 Aug 2020 15:08:11 +0530 Subject: [PATCH 1/2] Add SeedVault in packages and make this default backup transport Change-Id: I80eb32bc9a1cd15143db66d493b422fdd3bfbbff --- config/common.mk | 3 ++- config/permissions/backup.xml | 2 ++ config/permissions/privapp-permissions-lineage.xml | 8 ++++++++ .../packages/SettingsProvider/res/values/defaults.xml | 4 +++- 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/config/common.mk b/config/common.mk index 9f82bc97d..5b79be026 100644 --- a/config/common.mk +++ b/config/common.mk @@ -148,7 +148,8 @@ PRODUCT_PACKAGES += \ BrowserWebView \ Apps \ ESmsSync \ - PwaPlayer + PwaPlayer \ + SeedVault # Optional Applications ifeq ($(MINIMAL_APPS),false) diff --git a/config/permissions/backup.xml b/config/permissions/backup.xml index c335b298f..20798fdb6 100644 --- a/config/permissions/backup.xml +++ b/config/permissions/backup.xml @@ -22,4 +22,6 @@ service="com.google.android.gms/.backup.BackupTransportService" /> + \ No newline at end of file diff --git a/config/permissions/privapp-permissions-lineage.xml b/config/permissions/privapp-permissions-lineage.xml index 262fe13ed..610cb93ed 100644 --- a/config/permissions/privapp-permissions-lineage.xml +++ b/config/permissions/privapp-permissions-lineage.xml @@ -107,4 +107,12 @@ + + + + + + + + diff --git a/overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml index fd15ab863..d1ba5535f 100644 --- a/overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml +++ b/overlay/common/frameworks/base/packages/SettingsProvider/res/values/defaults.xml @@ -19,5 +19,7 @@ true - com.google.android.gms/.backup.BackupTransportService + + true + com.stevesoltys.seedvault.transport.ConfigurableBackupTransport -- GitLab From 770c75463c235a680df41e2ac0edb08e7381f949 Mon Sep 17 00:00:00 2001 From: Romain Hunault Date: Fri, 4 Sep 2020 12:14:17 +0200 Subject: [PATCH 2/2] Include SeedVault with an env variable --- config/common.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/config/common.mk b/config/common.mk index 5b79be026..52c0a5fb9 100644 --- a/config/common.mk +++ b/config/common.mk @@ -148,8 +148,11 @@ PRODUCT_PACKAGES += \ BrowserWebView \ Apps \ ESmsSync \ - PwaPlayer \ - SeedVault + PwaPlayer + +ifeq ($(INCLUDE_BACKUP_APP),true) +PRODUCT_PACKAGES += SeedVault +endif # Optional Applications ifeq ($(MINIMAL_APPS),false) -- GitLab