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

Commit 966fffd3 authored by Jean-François Geyelin's avatar Jean-François Geyelin Committed by Automerger Merge Worker
Browse files

Merge "Throw when ScriptC is used on unsupported ABIs" into main am: 82b08385 am: b69dbff6 

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



Change-Id: I7bde386314ab512d10a770ef727269aeed8d1125
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 17bab3e3 b69dbff6

rs/java/android/renderscript/ScriptC.java

+15 −3
Original line number Diff line number Diff line
@@ -101,7 +101,19 @@ public class ScriptC extends Script { 
        setID(id);

    }



    private static void throwExceptionIfSDKTooHigh() {

    private static void throwExceptionIfScriptCUnsupported() {

        // Checks that this device actually does have an ABI that supports ScriptC.

        //

        // For an explanation as to why `System.loadLibrary` is used, see discussion at

        // https://android-review.googlesource.com/c/platform/frameworks/base/+/2957974/comment/2f908b80_a05292ee

        try {

            System.loadLibrary("RS");

        } catch (UnsatisfiedLinkError e) {

            String s = "This device does not have an ABI that supports ScriptC.";

            throw new UnsupportedOperationException(s);

        }



        // Throw an exception if the target API is 35 or above

        String message =

                "ScriptC scripts are not supported when targeting an API Level >= 35. Please refer "

                    + "to https://developer.android.com/guide/topics/renderscript/migration-guide "
@@ -113,7 +125,7 @@ public class ScriptC extends Script { 
    }



    private static synchronized long internalCreate(RenderScript rs, Resources resources, int resourceID) {

        throwExceptionIfSDKTooHigh();

        throwExceptionIfScriptCUnsupported();

        byte[] pgm;

        int pgmLength;

        InputStream is = resources.openRawResource(resourceID);
@@ -150,7 +162,7 @@ public class ScriptC extends Script { 


    private static synchronized long internalStringCreate(RenderScript rs, String resName, byte[] bitcode) {

        //        Log.v(TAG, "Create script for resource = " + resName);

        throwExceptionIfSDKTooHigh();

        throwExceptionIfScriptCUnsupported();

        return rs.nScriptCCreate(resName, RenderScript.getCachePath(), bitcode, bitcode.length);

    }

}