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

Commit d26b5778 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add service registerer for "artd_pre_reboot" and... 

Merge "Add service registerer for "artd_pre_reboot" and "dexopt_chroot_setup"." into main am: 3a7cd42a am: 1e24c924

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2936070



Change-Id: I0f9e693b22e70d12a384af72afb4cfbf684b8ca8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 81a69d06 1e24c924

core/api/module-lib-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -350,7 +350,9 @@ package android.nfc { 
package android.os {



  public class ArtModuleServiceManager {

    method @FlaggedApi("android.content.pm.use_art_service_v2") @NonNull public android.os.ArtModuleServiceManager.ServiceRegisterer getArtdPreRebootServiceRegisterer();

    method @NonNull public android.os.ArtModuleServiceManager.ServiceRegisterer getArtdServiceRegisterer();

    method @FlaggedApi("android.content.pm.use_art_service_v2") @NonNull public android.os.ArtModuleServiceManager.ServiceRegisterer getDexoptChrootSetupServiceRegisterer();

  }



  public static final class ArtModuleServiceManager.ServiceRegisterer {

core/java/android/os/ArtModuleServiceManager.java

+16 −0
Original line number Diff line number Diff line
@@ -15,9 +15,11 @@ 
 */

package android.os;



import android.annotation.FlaggedApi;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.SystemApi;

import android.content.pm.Flags;



/**

 * Provides a way to register and obtain the system service binder objects managed by the ART
@@ -60,4 +62,18 @@ public class ArtModuleServiceManager { 
    public ServiceRegisterer getArtdServiceRegisterer() {

        return new ServiceRegisterer("artd");

    }



    /** Returns {@link ServiceRegisterer} for the "artd_pre_reboot" service. */

    @NonNull

    @FlaggedApi(Flags.FLAG_USE_ART_SERVICE_V2)

    public ServiceRegisterer getArtdPreRebootServiceRegisterer() {

        return new ServiceRegisterer("artd_pre_reboot");

    }



    /** Returns {@link ServiceRegisterer} for the "dexopt_chroot_setup" service. */

    @NonNull

    @FlaggedApi(Flags.FLAG_USE_ART_SERVICE_V2)

    public ServiceRegisterer getDexoptChrootSetupServiceRegisterer() {

        return new ServiceRegisterer("dexopt_chroot_setup");

    }

}