commit 384230f9e0e8116bedefbe934d4d46c33646bf9d
author Annie Meng <anniemeng@google.com> Wed Nov 28 10:58:08 2018 +0000
committer Annie Meng <anniemeng@google.com> Wed Nov 28 12:30:21 2018 +0000
tree 2e96d07d81ff3f1c6d920319a85017d79ba64e35
parent 813716b1990d5c1c044ac4d735b9c52eba965e18

[Multi-user] Rename GlobalBackupManagerService -> BackupManagerService

Restore original naming since UserBackupManagerService is now merged.

Just find and replace, no functionality changes in this CL.

Bug: 118520567
Test: 1) atest RunFrameworksServicesRoboTests
2) atest $(find \
frameworks/base/services/tests/servicestests/src/com/android/server/backup \
-name '*Test.java')
3) adb shell bmgr flows
Change-Id: Ia37997cec93fac9ebb5102edfff9000c9cff4eb1

services/java/com/android/server/SystemServer.java

diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index fbfb284..f8ac41f 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -178,7 +178,7 @@
      * them from the build system somehow.
      */
     private static final String BACKUP_MANAGER_SERVICE_CLASS =
-            "com.android.server.backup.GlobalBackupManagerService$Lifecycle";
+            "com.android.server.backup.BackupManagerService$Lifecycle";
     private static final String APPWIDGET_SERVICE_CLASS =
             "com.android.server.appwidget.AppWidgetService";
     private static final String VOICE_RECOGNITION_MANAGER_SERVICE_CLASS =