Merge change 6918

* changes:
  Make the backup manager do nothing when backup is turned off.

1 files changed, 9 insertions, 0 deletions

diff --git a/core/java/android/backup/BackupManager.java b/core/java/android/backup/BackupManager.java
index 86d89218c766..da1647a5abcb 100644
--- a/core/java/android/backup/BackupManager.java
+++ b/core/java/android/backup/BackupManager.java
@@ -73,6 +73,9 @@ public class BackupManager {
      * {@link android.app.BackupAgent} subclass will be scheduled when you call this method.
      */
     public void dataChanged() {
+        if (!EVEN_THINK_ABOUT_DOING_RESTORE) {
+            return;
+        }
         checkServiceBinder();
         if (sService != null) {
             try {
@@ -92,6 +95,9 @@ public class BackupManager {
      * permission if the package named in the argument is not the caller's own.
      */
     public static void dataChanged(String packageName) {
+        if (!EVEN_THINK_ABOUT_DOING_RESTORE) {
+            return;
+        }
         checkServiceBinder();
         if (sService != null) {
             try {
@@ -110,6 +116,9 @@ public class BackupManager {
      * {@hide}
      */
     public IRestoreSession beginRestoreSession(String transport) {
+        if (!EVEN_THINK_ABOUT_DOING_RESTORE) {
+            return null;
+        }
         IRestoreSession binder = null;
         checkServiceBinder();
         if (sService != null) {