diff --git a/core/api/module-lib-current.txt b/core/api/module-lib-current.txt index e928eb5f77318..e12e88ad50532 100644 --- a/core/api/module-lib-current.txt +++ b/core/api/module-lib-current.txt @@ -297,6 +297,14 @@ package android.net.netstats { package android.os { + public class ArtModuleServiceManager { + method @NonNull public android.os.ArtModuleServiceManager.ServiceRegisterer getArtdServiceRegisterer(); + } + + public static final class ArtModuleServiceManager.ServiceRegisterer { + method @Nullable public android.os.IBinder waitForService(); + } + public final class BatteryStatsManager { method @RequiresPermission(anyOf={android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK, android.Manifest.permission.NETWORK_STACK}) public void reportNetworkInterfaceForTransports(@NonNull String, @NonNull int[]) throws java.lang.RuntimeException; } diff --git a/core/java/android/os/ArtModuleServiceManager.java b/core/java/android/os/ArtModuleServiceManager.java new file mode 100644 index 0000000000000..0009e61f3a6fc --- /dev/null +++ b/core/java/android/os/ArtModuleServiceManager.java @@ -0,0 +1,63 @@ +/* + * Copyright (C) 2022 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package android.os; + +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.annotation.SystemApi; + +/** + * Provides a way to register and obtain the system service binder objects managed by the ART + * mainline module. + * + * Only the ART mainline module will be able to access an instance of this class. + * + * @hide + */ +@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) +public class ArtModuleServiceManager { + /** @hide */ + public ArtModuleServiceManager() {} + + /** A class that exposes the method to obtain each system service. */ + public static final class ServiceRegisterer { + @NonNull private final String mServiceName; + + /** @hide */ + public ServiceRegisterer(@NonNull String serviceName) { + mServiceName = serviceName; + } + + /** + * Returns the service from the service manager. + * + * If the service is not running, servicemanager will attempt to start it, and this function + * will wait for it to be ready. + * + * @return {@code null} only if there are permission problems or fatal errors. + */ + @Nullable + public IBinder waitForService() { + return ServiceManager.waitForService(mServiceName); + } + } + + /** Returns {@link ServiceRegisterer} for the "artd" service. */ + @NonNull + public ServiceRegisterer getArtdServiceRegisterer() { + return new ServiceRegisterer("artd"); + } +} diff --git a/core/java/android/os/OWNERS b/core/java/android/os/OWNERS index 1924dc6b651b5..5c5af2a26a532 100644 --- a/core/java/android/os/OWNERS +++ b/core/java/android/os/OWNERS @@ -73,3 +73,6 @@ per-file Trace.java = file:/TRACE_OWNERS # PermissionEnforcer per-file PermissionEnforcer.java = tweek@google.com, brufino@google.com + +# ART +per-file ArtModuleServiceManager.java = file:platform/art:/OWNERS