Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53bb6db4 authored by Kenny Root's avatar Kenny Root Committed by android-build-merger
Browse files

Merge "Move RecoverySystemService into its own package" 

am: 91643993

Change-Id: Iaa931ad488b059c981646fc6684c782e47a1edf3
parents 277ea358 91643993

services/core/java/com/android/server/RecoverySystemService.java→services/core/java/com/android/server/recoverysystem/RecoverySystemService.java

+3 −1
Original line number Diff line number Diff line
@@ -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;

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

+1 −0
Original line number Diff line number Diff line
@@ -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;