Merge "Update language to comply with Android's inclusive language guidance"
diff --git a/cpu_ref/rsCpuScript.cpp b/cpu_ref/rsCpuScript.cpp
index e41a6b8..a495246 100644
--- a/cpu_ref/rsCpuScript.cpp
+++ b/cpu_ref/rsCpuScript.cpp
@@ -357,7 +357,7 @@
}
}
else {
- // add a dummy/constant as a checksum if verification is disabled
+ // add a placeholder/constant as a checksum if verification is disabled
mBuildChecksum = 0xabadcafe;
}
diff --git a/script_api/GenerateRSFunctionsList.cpp b/script_api/GenerateRSFunctionsList.cpp
index 26dd1ef..38fa4d7 100644
--- a/script_api/GenerateRSFunctionsList.cpp
+++ b/script_api/GenerateRSFunctionsList.cpp
@@ -442,7 +442,7 @@
// Add a uniquely named variable definition to the file and return its name.
static const string addVariable(GeneratedFile* file, unsigned int* variableNumber) {
const string name = "buf" + to_string((*variableNumber)++);
- /* Some data structures like rs_tm can't be exported. We'll just use a dumb buffer
+ /* Some data structures like rs_tm can't be exported. We'll just use a unexpected buffer
* and cast its address later on.
*/
*file << "char " << name << "[200];\n";
diff --git a/support/java/src/androidx/renderscript/Allocation.java b/support/java/src/androidx/renderscript/Allocation.java
index b6588c0..cb14a50 100644
--- a/support/java/src/androidx/renderscript/Allocation.java
+++ b/support/java/src/androidx/renderscript/Allocation.java
@@ -225,7 +225,7 @@
}
/**
- * Getter & Setter for the dummy allocation for Inc Support Lib.
+ * Getter & Setter for the placeholder allocation for Inc Support Lib.
*
*/
public long getIncAllocID() {
diff --git a/support/java/src/androidx/renderscript/Element.java b/support/java/src/androidx/renderscript/Element.java
index 44dbc61..b385b0f 100644
--- a/support/java/src/androidx/renderscript/Element.java
+++ b/support/java/src/androidx/renderscript/Element.java
@@ -755,7 +755,7 @@
}
/*
- * Get an identical dummy Element for Compat Context
+ * Get an identical placeholder Element for Compat Context
*
*/
public long getDummyElement(RenderScript mRS) {
diff --git a/support/java/src/androidx/renderscript/RenderScript.java b/support/java/src/androidx/renderscript/RenderScript.java
index cf80342..10836d9 100644
--- a/support/java/src/androidx/renderscript/RenderScript.java
+++ b/support/java/src/androidx/renderscript/RenderScript.java
@@ -65,13 +65,13 @@
static private String mBlackList = "";
/**
- * Sets the blackList of Models to only use support lib runtime.
+ * Sets the denylist of Models to only use support lib runtime.
* Should be used before context create.
*
- * @param blackList User provided black list string.
+ * @param denylist User provided denylist string.
*
* Format: "(MANUFACTURER1:PRODUCT1:MODEL1), (MANUFACTURER2:PRODUCT2:MODEL2)..."
- * e.g. : To Blacklist Nexus 7(2013) and Nexus 5.
+ * e.g. : To Denylist Nexus 7(2013) and Nexus 5.
* mBlackList = "(asus:razor:Nexus 7), (LGE:hammerhead:Nexus 5)";
*/
static public void setBlackList(String blackList) {
@@ -224,7 +224,7 @@
}
if (sNative == 1) {
- // check against the blacklist
+ // check against the denylist
if (mBlackList.length() > 0) {
String deviceInfo = '(' +
android.os.Build.MANUFACTURER +
@@ -797,7 +797,7 @@
mIncLoaded = true;
}
if (mIncCon == 0) {
- //Create a dummy compat context (synchronous).
+ //Create a placeholder compat context (synchronous).
long device = nIncDeviceCreate();
mIncCon = nIncContextCreate(device, 0, 0, 0);
}
@@ -1044,7 +1044,7 @@
long mContext;
private boolean mDestroyed = false;
- //Dummy device & context for Inc Support Lib
+ //Placeholder device & context for Inc Support Lib
long mIncCon;
//indicator of whether inc support lib has been loaded or not.
boolean mIncLoaded;
diff --git a/support/java/src/androidx/renderscript/Type.java b/support/java/src/androidx/renderscript/Type.java
index cec834c..a330cae 100644
--- a/support/java/src/androidx/renderscript/Type.java
+++ b/support/java/src/androidx/renderscript/Type.java
@@ -190,7 +190,7 @@
}
/*
- * Get an identical dummy Type for Compat Context
+ * Get an identical placeholder Type for Compat Context
*
*/
public long getDummyType(RenderScript mRS, long eid) {
diff --git a/support/jni/android_renderscript_RenderScript.cpp b/support/jni/android_renderscript_RenderScript.cpp
index b65243c..c2911be 100644
--- a/support/jni/android_renderscript_RenderScript.cpp
+++ b/support/jni/android_renderscript_RenderScript.cpp
@@ -2129,7 +2129,7 @@
}
// -----------------------------------
-// To create/destroy a dummy context
+// To create/destroy a placeholder context
static void
nIncObjDestroy(JNIEnv *_env, jobject _this, jlong con, jlong obj)
{
@@ -2177,7 +2177,7 @@
}
// -----------------------------------
-// Create dummy Element
+// Create placeholder Element
static jlong
nIncElementCreate(JNIEnv *_env, jobject _this, jlong con, jlong type, jint kind, jboolean norm, jint size)
{
@@ -2187,7 +2187,7 @@
(RsDataKind)kind, norm, size);
}
// -----------------------------------
-// Create dummy Type
+// Create placeholder Type
static jlong
nIncTypeCreate(JNIEnv *_env, jobject _this, jlong con, jlong eid,
jint dimx, jint dimy, jint dimz, jboolean mips, jboolean faces, jint yuv)
diff --git a/tests/java_api/Refocus/dataExtraction/RefocusTestTimingProcess.txt b/tests/java_api/Refocus/dataExtraction/RefocusTestTimingProcess.txt
index 98460a4..1d82453 100644
--- a/tests/java_api/Refocus/dataExtraction/RefocusTestTimingProcess.txt
+++ b/tests/java_api/Refocus/dataExtraction/RefocusTestTimingProcess.txt
@@ -26,7 +26,7 @@
…..logs 2…..
3.
…..logs 3…..
- N5 (you have to put this dummy line here. The script is not perfect and feel free to change)
+ N5 (you have to put this placeholder line here. The script is not perfect and feel free to change)
3. Put the file “extract_ave.sh” and “extract_data.sh” in the same directory as the file N5.txt
diff --git a/tests/lldb/run_tests.py b/tests/lldb/run_tests.py
index 2ac5123..cd78cec 100755
--- a/tests/lldb/run_tests.py
+++ b/tests/lldb/run_tests.py
@@ -173,7 +173,7 @@
# use the default configuration
config = Config()
- # save the test blacklist
+ # save the test denylist
self.blacklist = _choice(args.blacklist, config.blacklist)
# Allow any of the command line arguments to override the
