commit 5021918605020c44c7ee66fbc896955abdd1517f
author Artem Iglikov <artikz@google.com> Wed Apr 05 15:27:54 2017 +0100
committer Artem Iglikov <artikz@google.com> Thu Apr 06 12:28:13 2017 +0100
tree 0fef599c2df37c5e06020d010d3fc2bfcef1af09
parent c6f9ea881cd86e5dfc2bdb4962678c4821166f8d

Clone BackupManagerService and make Trampoline aware of the clone.

RefactoredBackupManagerService is an exact clone of
BackupManagerService. Trampoline chooses between these two based on
backup_refactored_service_disabled global setting, defaulting to true.

Test: manual: flashed the device, ran `settings put global
backup_refactored_service_disabled 1|0`, verified that correct class was
instantiated, ran bmgr backupnow command to make sure that it works.

Bug: 36850431

Change-Id: I8ef91b928a40aae022f88f07a4126a00b1d5e220

core/tests/coretests/src/android/provider/SettingsBackupTest.java

diff --git a/core/tests/coretests/src/android/provider/SettingsBackupTest.java b/core/tests/coretests/src/android/provider/SettingsBackupTest.java
index 782a50f..c8771c2 100644
--- a/core/tests/coretests/src/android/provider/SettingsBackupTest.java
+++ b/core/tests/coretests/src/android/provider/SettingsBackupTest.java
@@ -101,6 +101,7 @@
                     Settings.Global.APP_IDLE_CONSTANTS,
                     Settings.Global.ASSISTED_GPS_ENABLED,
                     Settings.Global.AUDIO_SAFE_VOLUME_STATE,
+                    Settings.Global.BACKUP_REFACTORED_SERVICE_DISABLED,
                     Settings.Global.BATTERY_DISCHARGE_DURATION_THRESHOLD,
                     Settings.Global.BATTERY_DISCHARGE_THRESHOLD,
                     Settings.Global.BLE_SCAN_ALWAYS_AVAILABLE,