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

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

Merge "Delay the removal of support of ScriptC from TargetAPI 35 to 36" into... 

Merge "Delay the removal of support of ScriptC from TargetAPI 35 to 36" into main am: a663e278 am: 72bcb498

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



Change-Id: I1a91a84db938ca72a972a4ecedd049298999656c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7ba2da68 72bcb498

rs/java/android/renderscript/ScriptC.java

+5 −5
Original line number Diff line number Diff line
@@ -38,12 +38,12 @@ public class ScriptC extends Script { 
    private static final String TAG = "ScriptC";



    /**

     * In targetSdkVersion 35 and above, Renderscript's ScriptC stops being supported

     * In targetSdkVersion 36 and above, Renderscript's ScriptC stops being supported

     * and an exception is thrown when the class is instantiated.

     * In targetSdkVersion 34 and below, Renderscript's ScriptC still works.

     * In targetSdkVersion 35 and below, Renderscript's ScriptC still works.

     */

    @ChangeId

    @EnabledAfter(targetSdkVersion = 35)

    @EnabledAfter(targetSdkVersion = 36)

    private static final long RENDERSCRIPT_SCRIPTC_DEPRECATION_CHANGE_ID = 297019750L;



    /**
@@ -113,9 +113,9 @@ public class ScriptC extends Script { 
            throw new UnsupportedOperationException(s);

        }



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

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

        String message =

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

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

                    + "to https://developer.android.com/guide/topics/renderscript/migration-guide "

                    + "for proposed alternatives.";

        Slog.w(TAG, message);