From f96836ed3ad6a235ccfef5cf9694cf5aa5adc219 Mon Sep 17 00:00:00 2001
From: Kenny Root <kroot@google.com>
Date: Tue, 19 Nov 2019 17:11:34 -0800
Subject: [PATCH] Move RecoverySystemService into its own package

This helps reviewing the refactor of the RecoverySystemService in which it
is made a bit more testable.

Test: make && emulator
Change-Id: Ifc5a658fe68ed10ab400f43d1d3967c0acccbd11
---
 .../server/{ => recoverysystem}/RecoverySystemService.java    | 4 +++-
 services/java/com/android/server/SystemServer.java            | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)
 rename services/core/java/com/android/server/{ => recoverysystem}/RecoverySystemService.java (99%)

diff --git a/services/core/java/com/android/server/RecoverySystemService.java b/services/core/java/com/android/server/recoverysystem/RecoverySystemService.java
similarity index 99%
rename from services/core/java/com/android/server/RecoverySystemService.java
rename to services/core/java/com/android/server/recoverysystem/RecoverySystemService.java
index 997178e1582b2..d78aaa5f9c9d2 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 16c60ca3997ae..c1b7a50a86232 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -135,6 +135,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;