Merge "Move RecoverySystemService into its own package" am: 9164399321

am: 53bb6db434

Change-Id: Id4d147684fbad83a10f730ec1464688c2b912986

2 files changed, 4 insertions, 1 deletions

diff --git a/services/core/java/com/android/server/RecoverySystemService.java b/services/core/java/com/android/server/recoverysystem/RecoverySystemService.java
index 997178e1582b..d78aaa5f9c9d 100644
--- a/services/core/java/com/android/server/RecoverySystemService.java
+++ b/services/core/java/com/android/server/recoverysystem/RecoverySystemService.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.server;
+package com.android.server.recoverysystem;
 
 import android.content.Context;
 import android.net.LocalSocket;
@@ -27,6 +27,8 @@ import android.os.RemoteException;
 import android.os.SystemProperties;
 import android.util.Slog;
 
+import com.android.server.SystemService;
+
 import libcore.io.IoUtils;
 
 import java.io.DataInputStream;
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 80535e496fbc..55e80f39e030 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -137,6 +137,7 @@ import com.android.server.policy.role.LegacyRoleResolutionPolicy;
 import com.android.server.power.PowerManagerService;
 import com.android.server.power.ShutdownThread;
 import com.android.server.power.ThermalManagerService;
+import com.android.server.recoverysystem.RecoverySystemService;
 import com.android.server.restrictions.RestrictionsManagerService;
 import com.android.server.role.RoleManagerService;
 import com.android.server.rollback.RollbackManagerService;