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

Commit ebbe3d5e authored by Makoto Onuki's avatar Makoto Onuki
Browse files

Move RavenwoodEnvironment_ravenwood to f/b/c + rename

Bug: 292141694
Flag: TEST_ONLY
Test: $ANDROID_BUILD_TOP/frameworks/base/ravenwood/scripts/run-ravenwood-tests.sh -s
Change-Id: Ia153b38730d9c255d73c66987ee6ce8874826c25
parent ebb4d530
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ import android.util.TypedValue;
import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.content.om.OverlayConfig;
import com.android.internal.ravenwood.RavenwoodEnvironment;
import com.android.internal.ravenwood.RavenwoodHelperBridge;

import java.io.FileDescriptor;
import java.io.FileNotFoundException;
@@ -226,7 +226,7 @@ public final class AssetManager implements AutoCloseable {
    }

    private static String getFrameworkApkPath$ravenwood() {
        return RavenwoodEnvironment.getInstance().getRavenwoodRuntimePath()
        return RavenwoodHelperBridge.getInstance().getRavenwoodRuntimePath()
                + FRAMEWORK_APK_PATH_RAVENWOOD;
    }

@@ -286,7 +286,7 @@ public final class AssetManager implements AutoCloseable {

            // TODO(Ravenwood): overlay support?
            final String[] systemIdmapPaths =
                    RavenwoodEnvironment.getInstance().isRunningOnRavenwood() ? new String[0] :
                    RavenwoodHelperBridge.getInstance().isRunningOnRavenwood() ? new String[0] :
                    OverlayConfig.getZygoteInstance().createImmutableFrameworkIdmapsInZygote();
            for (String idmapPath : systemIdmapPaths) {
                apkAssets.add(ApkAssets.loadOverlayFromPath(idmapPath, ApkAssets.PROPERTY_SYSTEM));
@@ -1854,7 +1854,7 @@ public final class AssetManager implements AutoCloseable {
            @Nullable XmlBlock.Parser parser, @NonNull int[] inAttrs, long outValuesAddress,
            long outIndicesAddress) {
        Objects.requireNonNull(inAttrs, "inAttrs");
        var runtime = RavenwoodEnvironment.getInstance();
        var runtime = RavenwoodHelperBridge.getInstance();
        final int[] outValues = runtime.fromAddress(outValuesAddress);
        final int[] outIndices = runtime.fromAddress(outIndicesAddress);
        synchronized (this) {
+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@

package android.os;

import com.android.internal.ravenwood.RavenwoodEnvironment;
import com.android.internal.ravenwood.RavenwoodHelperBridge;

import dalvik.annotation.optimization.CriticalNative;
import dalvik.annotation.optimization.FastNative;
@@ -103,7 +103,7 @@ public final class PerfettoTrace {
            mSeverity = severity;
            mPtr = native_init(name, tag, severity);
            mExtraPtr = native_get_extra_ptr(mPtr);
            if (!RavenwoodEnvironment.getInstance().isRunningOnRavenwood()) {
            if (!RavenwoodHelperBridge.getInstance().isRunningOnRavenwood()) {
                sRegistry.registerNativeAllocation(this, mPtr);
            }
        }
+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@

package android.os;

import com.android.internal.ravenwood.RavenwoodEnvironment;
import com.android.internal.ravenwood.RavenwoodHelperBridge;

import dalvik.annotation.optimization.CriticalNative;
import dalvik.annotation.optimization.FastNative;
@@ -654,7 +654,7 @@ public final class PerfettoTrackEventExtra {

    private PerfettoTrackEventExtra() {
        mPtr = native_init();
        if (!RavenwoodEnvironment.getInstance().isRunningOnRavenwood()) {
        if (!RavenwoodHelperBridge.getInstance().isRunningOnRavenwood()) {
            sRegistry.registerNativeAllocation(this, mPtr);
        }
    }
+13 −5
Original line number Diff line number Diff line
@@ -33,11 +33,11 @@ import android.ravenwood.annotation.RavenwoodReplace;
 * is mostly redundant. Clean it up.
 */
@RavenwoodKeepWholeClass
@RavenwoodRedirectionClass("RavenwoodEnvironment_ravenwood")
public final class RavenwoodEnvironment {
    public static final String TAG = "RavenwoodEnvironment";
@RavenwoodRedirectionClass("RavenwoodHelperBridge_ravenwood")
public final class RavenwoodHelperBridge {
    public static final String TAG = "RavenwoodHelperBridge";

    private static RavenwoodEnvironment sInstance = new RavenwoodEnvironment();
    private static RavenwoodHelperBridge sInstance = new RavenwoodHelperBridge();

    private static RuntimeException notSupportedOnDevice() {
        return new UnsupportedOperationException("This method can only be used on Ravenwood");
@@ -46,7 +46,7 @@ public final class RavenwoodEnvironment {
    /**
     * @return the singleton instance.
     */
    public static RavenwoodEnvironment getInstance() {
    public static RavenwoodHelperBridge getInstance() {
        return sInstance;
    }

@@ -61,8 +61,12 @@ public final class RavenwoodEnvironment {
     *
     * <p>If someone needs it without having access to the SDK, the following hack would work too.
     * <code>System.getProperty("android.ravenwood.version") != null</code>
     *
     * @deprecated Use {@link
     * com.android.modules.utils.ravenwood.RavenwoodHelper#isRunningOnRavenwood} instead.
     */
    @RavenwoodReplace
    @Deprecated
    public boolean isRunningOnRavenwood() {
        return false;
    }
@@ -82,8 +86,12 @@ public final class RavenwoodEnvironment {

    /**
     * @return the "ravenwood-runtime" directory.
     *
     * @deprecated Use {@link
     * com.android.modules.utils.ravenwood.RavenwoodHelper#getRavenwoodRuntimePath()} instead.
     */
    @RavenwoodRedirect
    @Deprecated
    public String getRavenwoodRuntimePath() {
        throw notSupportedOnDevice();
    }
+6 −6
Original line number Diff line number Diff line
@@ -18,21 +18,21 @@ package com.android.internal.ravenwood;
import com.android.ravenwood.OpenJdkWorkaround;
import com.android.ravenwood.common.RavenwoodInternalUtils;

public class RavenwoodEnvironment_ravenwood {
    private RavenwoodEnvironment_ravenwood() {
public class RavenwoodHelperBridge_ravenwood {
    private RavenwoodHelperBridge_ravenwood() {
    }

    /**
     * Called from {@link RavenwoodEnvironment#getRavenwoodRuntimePath()}.
     * Called from {@link RavenwoodHelperBridge#getRavenwoodRuntimePath()}.
     */
    public static String getRavenwoodRuntimePath(RavenwoodEnvironment env) {
    public static String getRavenwoodRuntimePath(RavenwoodHelperBridge env) {
        return RavenwoodInternalUtils.getRavenwoodRuntimePath();
    }

    /**
     * Called from {@link RavenwoodEnvironment#fromAddress(long)}.
     * Called from {@link RavenwoodHelperBridge#fromAddress(long)}.
     */
    public static <T> T fromAddress(RavenwoodEnvironment env, long address) {
    public static <T> T fromAddress(RavenwoodHelperBridge env, long address) {
        return OpenJdkWorkaround.fromAddress(address);
    }
}
Loading