summaryrefslogtreecommitdiff
path: root/rs
diff options
context:
space:
mode:
author Jean-François <jif@google.com> 2024-02-19 15:33:52 +0100
committer Jean-François Geyelin <jif@google.com> 2024-02-26 15:27:04 +0000
commita831939d97e3ba0d191c90c637dd1ac605f44cee (patch)
tree67951546304182ce877fd9a3bc809d8b1c550073 /rs
parent82b08385c0041701acffb86b55bf6b19b5ffc531 (diff)
Delay the removal of support of ScriptC from TargetAPI 35 to 36
Bug: 206676167 Test: m Change-Id: I914366f6cef19df5f528bb0a43b51d17b50ca1ae
Diffstat (limited to 'rs')
-rw-r--r--rs/java/android/renderscript/ScriptC.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/rs/java/android/renderscript/ScriptC.java b/rs/java/android/renderscript/ScriptC.java
index 4a2f3da0eb06..e9f6031e5048 100644
--- a/rs/java/android/renderscript/ScriptC.java
+++ b/rs/java/android/renderscript/ScriptC.java
@@ -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);