Merge "16k: Get the page size dynamically" into main
diff --git a/api/OWNERS b/api/OWNERS
index bf6216c..965093c 100644
--- a/api/OWNERS
+++ b/api/OWNERS
@@ -3,7 +3,10 @@
# Modularization team
file:platform/packages/modules/common:/OWNERS
+# Soong plugin owned by Soong team.
+per-file *.go,go.mod,go.work,go.work.sum = file:platform/build/soong:/OWNERS
+
per-file Android.bp = file:platform/build/soong:/OWNERS #{LAST_RESORT_SUGGESTION}
# For metalava team to disable lint checks in platform
-per-file Android.bp = aurimas@google.com,emberrose@google.com,sjgilbert@google.com
+per-file Android.bp = aurimas@google.com,emberrose@google.com
diff --git a/rs/java/android/renderscript/ScriptC.java b/rs/java/android/renderscript/ScriptC.java
index eb7e9ae..1866a99 100644
--- a/rs/java/android/renderscript/ScriptC.java
+++ b/rs/java/android/renderscript/ScriptC.java
@@ -16,12 +16,9 @@
package android.renderscript;
-import android.app.compat.CompatChanges;
-import android.compat.annotation.ChangeId;
-import android.compat.annotation.EnabledAfter;
import android.content.res.Resources;
-import android.util.Slog;
+import java.io.File;
import java.io.IOException;
import java.io.InputStream;
@@ -38,15 +35,6 @@
private static final String TAG = "ScriptC";
/**
- * In targetSdkVersion 35 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.
- */
- @ChangeId
- @EnabledAfter(targetSdkVersion = 35)
- private static final long RENDERSCRIPT_SCRIPTC_DEPRECATION_CHANGE_ID = 297019750L;
-
- /**
* Only intended for use by the generated derived classes.
*
* @param id
@@ -101,20 +89,7 @@
setID(id);
}
- private static void throwExceptionIfSDKTooHigh() {
- 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 "
- + "for proposed alternatives.";
- Slog.w(TAG, message);
- if (CompatChanges.isChangeEnabled(RENDERSCRIPT_SCRIPTC_DEPRECATION_CHANGE_ID)) {
- throw new UnsupportedOperationException(message);
- }
- }
-
- private static synchronized long internalCreate(
- RenderScript rs, Resources resources, int resourceID) {
- throwExceptionIfSDKTooHigh();
+ private static synchronized long internalCreate(RenderScript rs, Resources resources, int resourceID) {
byte[] pgm;
int pgmLength;
InputStream is = resources.openRawResource(resourceID);
@@ -150,7 +125,6 @@
}
private static synchronized long internalStringCreate(RenderScript rs, String resName, byte[] bitcode) {
- throwExceptionIfSDKTooHigh();
// Log.v(TAG, "Create script for resource = " + resName);
return rs.nScriptCCreate(resName, RenderScript.getCachePath(), bitcode, bitcode.length);
}