diff --git a/services/core/java/com/android/server/health/HealthServiceWrapper.java b/services/core/java/com/android/server/health/HealthServiceWrapper.java index 172730f9cb9c9..0b43f26e294d2 100644 --- a/services/core/java/com/android/server/health/HealthServiceWrapper.java +++ b/services/core/java/com/android/server/health/HealthServiceWrapper.java @@ -102,8 +102,7 @@ public abstract class HealthServiceWrapper { @NonNull HealthServiceWrapperHidl.IServiceManagerSupplier hidlServiceManagerSupplier, @NonNull HealthServiceWrapperHidl.IHealthSupplier hidlHealthSupplier) throws RemoteException, NoSuchElementException { - HealthServiceWrapperHidl service = new HealthServiceWrapperHidl(); - service.init(hidlRegCallback, hidlServiceManagerSupplier, hidlHealthSupplier); - return service; + return new HealthServiceWrapperHidl( + hidlRegCallback, hidlServiceManagerSupplier, hidlHealthSupplier); } } diff --git a/services/core/java/com/android/server/health/HealthServiceWrapperHidl.java b/services/core/java/com/android/server/health/HealthServiceWrapperHidl.java index 18d20bfe391d7..3bff2f83d3d2f 100644 --- a/services/core/java/com/android/server/health/HealthServiceWrapperHidl.java +++ b/services/core/java/com/android/server/health/HealthServiceWrapperHidl.java @@ -56,12 +56,6 @@ final class HealthServiceWrapperHidl extends HealthServiceWrapper { // Last IHealth service received. private final AtomicReference mLastService = new AtomicReference<>(); - /** - * init should be called after constructor. For testing purposes, init is not called by - * constructor. - */ - HealthServiceWrapperHidl() {} - private static void traceBegin(String name) { Trace.traceBegin(Trace.TRACE_TAG_SYSTEM_SERVER, name); } @@ -181,7 +175,7 @@ final class HealthServiceWrapperHidl extends HealthServiceWrapper { * @throws NullPointerException when supplier is null */ @VisibleForTesting - void init( + HealthServiceWrapperHidl( @Nullable Callback callback, @NonNull IServiceManagerSupplier managerSupplier, @NonNull IHealthSupplier healthSupplier)