From d8a0cb7556a0bb3cf29a0b96e4c4e91c853cddb0 Mon Sep 17 00:00:00 2001 From: Bartosz Fabianowski Date: Fri, 5 Jan 2018 11:56:26 +0100 Subject: [PATCH] Start BackupManagerConstants content observer BackupManagerConstants has a content observer that is meant to be notified whenever backup settings change. However, that observer is never registered. Bug: 71622864 Test: cts-tradefed run cts-dev --module CtsBackupHostTestCase Change-Id: Icbd90ef3af83dd2f29e26a5d787505bcf5681154 --- .../java/com/android/server/backup/BackupManagerConstants.java | 3 --- .../com/android/server/backup/BackupManagerConstantsTest.java | 2 -- 2 files changed, 5 deletions(-) diff --git a/services/backup/java/com/android/server/backup/BackupManagerConstants.java b/services/backup/java/com/android/server/backup/BackupManagerConstants.java index b17f794800364..1a54e95789d0e 100644 --- a/services/backup/java/com/android/server/backup/BackupManagerConstants.java +++ b/services/backup/java/com/android/server/backup/BackupManagerConstants.java @@ -85,9 +85,6 @@ class BackupManagerConstants extends ContentObserver { super(handler); mResolver = resolver; updateSettings(); - } - - public void start() { mResolver.registerContentObserver( Settings.Secure.getUriFor(Settings.Secure.BACKUP_MANAGER_CONSTANTS), false, this); } diff --git a/services/robotests/src/com/android/server/backup/BackupManagerConstantsTest.java b/services/robotests/src/com/android/server/backup/BackupManagerConstantsTest.java index a473bc61941c1..c397f23b2b5a3 100644 --- a/services/robotests/src/com/android/server/backup/BackupManagerConstantsTest.java +++ b/services/robotests/src/com/android/server/backup/BackupManagerConstantsTest.java @@ -57,7 +57,6 @@ public class BackupManagerConstantsTest { final BackupManagerConstants constants = new BackupManagerConstants(handler, context.getContentResolver()); - constants.start(); assertThat(constants.getKeyValueBackupIntervalMilliseconds()) .isEqualTo(4 * AlarmManager.INTERVAL_HOUR); @@ -89,7 +88,6 @@ public class BackupManagerConstantsTest { final BackupManagerConstants constants = new BackupManagerConstants(handler, context.getContentResolver()); - constants.start(); assertThat(constants.getBackupFinishedNotificationReceivers()) .isEqualTo(new String[] {PACKAGE_NAME, ANOTHER_PACKAGE_NAME});