remove proxy binder service IIncrementalManager
This is no longer needed because native Incremental Service directly uses IDataLoaderManager. BUG: 150406132 Test: atest service.incremental_test Test: atest PackageManagerShellCommandIncrementalTest Change-Id: Idbde2988883becbf3eb707d42c0558774a6073e8
This commit is contained in:
@@ -105,7 +105,6 @@ import com.android.server.emergency.EmergencyAffordanceService;
|
||||
import com.android.server.gpu.GpuService;
|
||||
import com.android.server.hdmi.HdmiControlService;
|
||||
import com.android.server.incident.IncidentCompanionService;
|
||||
import com.android.server.incremental.IncrementalManagerService;
|
||||
import com.android.server.input.InputManagerService;
|
||||
import com.android.server.inputmethod.InputMethodManagerService;
|
||||
import com.android.server.inputmethod.InputMethodSystemProperty;
|
||||
@@ -335,7 +334,7 @@ public final class SystemServer {
|
||||
private ContentResolver mContentResolver;
|
||||
private EntropyMixer mEntropyMixer;
|
||||
private DataLoaderManagerService mDataLoaderManagerService;
|
||||
private IncrementalManagerService mIncrementalManagerService;
|
||||
private long mIncrementalServiceHandle = 0;
|
||||
|
||||
private boolean mOnlyCore;
|
||||
private boolean mFirstBoot;
|
||||
@@ -377,6 +376,16 @@ public final class SystemServer {
|
||||
*/
|
||||
private static native void spawnFdLeakCheckThread();
|
||||
|
||||
/**
|
||||
* Start native Incremental Service and get its handle.
|
||||
*/
|
||||
private static native long startIncrementalService();
|
||||
|
||||
/**
|
||||
* Inform Incremental Service that system is ready.
|
||||
*/
|
||||
private static native void setIncrementalServiceSystemReady(long incrementalServiceHandle);
|
||||
|
||||
/**
|
||||
* The main entry point from zygote.
|
||||
*/
|
||||
@@ -745,8 +754,8 @@ public final class SystemServer {
|
||||
t.traceEnd();
|
||||
|
||||
// Incremental service needs to be started before package manager
|
||||
t.traceBegin("StartIncrementalManagerService");
|
||||
mIncrementalManagerService = IncrementalManagerService.start(mSystemContext);
|
||||
t.traceBegin("StartIncrementalService");
|
||||
mIncrementalServiceHandle = startIncrementalService();
|
||||
t.traceEnd();
|
||||
|
||||
// Power manager needs to be started early because other services need it.
|
||||
@@ -2133,9 +2142,9 @@ public final class SystemServer {
|
||||
mPackageManagerService.systemReady();
|
||||
t.traceEnd();
|
||||
|
||||
if (mIncrementalManagerService != null) {
|
||||
t.traceBegin("MakeIncrementalManagerServiceReady");
|
||||
mIncrementalManagerService.systemReady();
|
||||
if (mIncrementalServiceHandle != 0) {
|
||||
t.traceBegin("MakeIncrementalServiceReady");
|
||||
setIncrementalServiceSystemReady(mIncrementalServiceHandle);
|
||||
t.traceEnd();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user