Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update language to comply with Android's inclusive language guidance" into rvc-dev-plus-aosp am: 63ed9937f0

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12282658

Change-Id: I439c446bcd55b35ec41d7c4f76a53e39de5cdd4e
This commit is contained in:
TreeHugger Robot
2020-08-03 16:17:14 +00:00
committed by Automerger Merge Worker
parent 9675f2fa72 63ed9937f0
commit ab9c465a44
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/jni/android_media_AudioSystem.cpp
View File

@@ -974,7 +974,7 @@ static jint convertAudioPortConfigFromNative(JNIEnv *env,
if (jHandle == NULL) { if (jHandle == NULL) {
return (jint)AUDIO_JAVA_ERROR; return (jint)AUDIO_JAVA_ERROR;
} }
// create dummy port and port config objects with just the correct handle // create placeholder port and port config objects with just the correct handle
// and configuration data. The actual AudioPortConfig objects will be // and configuration data. The actual AudioPortConfig objects will be
// constructed by java code with correct class type (device, mix etc...) // constructed by java code with correct class type (device, mix etc...)
// and reference to AudioPort instance in this client // and reference to AudioPort instance in this client

6
core/jni/android_net_NetUtils.cpp
View File

@@ -93,13 +93,13 @@ static void android_net_utils_attachDropAllBPFFilter(JNIEnv *env, jobject clazz,
static void android_net_utils_detachBPFFilter(JNIEnv *env, jobject clazz, jobject javaFd) static void android_net_utils_detachBPFFilter(JNIEnv *env, jobject clazz, jobject javaFd)
{ {
int dummy = 0; int optval_ignored = 0;
int fd = jniGetFDFromFileDescriptor(env, javaFd); int fd = jniGetFDFromFileDescriptor(env, javaFd);
if (setsockopt(fd, SOL_SOCKET, SO_DETACH_FILTER, &dummy, sizeof(dummy)) != 0) { if (setsockopt(fd, SOL_SOCKET, SO_DETACH_FILTER, &optval_ignored, sizeof(optval_ignored)) !=
0) {
jniThrowExceptionFmt(env, "java/net/SocketException", jniThrowExceptionFmt(env, "java/net/SocketException",
"setsockopt(SO_DETACH_FILTER): %s", strerror(errno)); "setsockopt(SO_DETACH_FILTER): %s", strerror(errno));
} }
} }
static jboolean android_net_utils_bindProcessToNetwork(JNIEnv *env, jobject thiz, jint netId) static jboolean android_net_utils_bindProcessToNetwork(JNIEnv *env, jobject thiz, jint netId)

2
core/jni/android_os_Debug.cpp
View File

@@ -920,7 +920,7 @@ int register_android_os_Debug(JNIEnv *env)
{ {
jclass clazz = env->FindClass("android/os/Debug$MemoryInfo"); jclass clazz = env->FindClass("android/os/Debug$MemoryInfo");
// Sanity check the number of other statistics expected in Java matches here. // Check the number of other statistics expected in Java matches here.
jfieldID numOtherStats_field = env->GetStaticFieldID(clazz, "NUM_OTHER_STATS", "I"); jfieldID numOtherStats_field = env->GetStaticFieldID(clazz, "NUM_OTHER_STATS", "I");
jint numOtherStats = env->GetStaticIntField(clazz, numOtherStats_field); jint numOtherStats = env->GetStaticIntField(clazz, numOtherStats_field);
jfieldID numDvkStats_field = env->GetStaticFieldID(clazz, "NUM_DVK_STATS", "I"); jfieldID numDvkStats_field = env->GetStaticFieldID(clazz, "NUM_DVK_STATS", "I");

2
core/jni/android_os_Parcel.cpp
View File

@@ -349,7 +349,7 @@ static jbyteArray android_os_Parcel_createByteArray(JNIEnv* env, jclass clazz, j
if (parcel != NULL) { if (parcel != NULL) {
int32_t len = parcel->readInt32(); int32_t len = parcel->readInt32();
// sanity check the stored length against the true data size // Validate the stored length against the true data size
if (len >= 0 && len <= (int32_t)parcel->dataAvail()) { if (len >= 0 && len <= (int32_t)parcel->dataAvail()) {
ret = env->NewByteArray(len); ret = env->NewByteArray(len);

2
core/jni/android_util_Binder.cpp
View File

@@ -961,7 +961,7 @@ static jlong android_os_Binder_clearCallingIdentity()
static void android_os_Binder_restoreCallingIdentity(JNIEnv* env, jobject clazz, jlong token) static void android_os_Binder_restoreCallingIdentity(JNIEnv* env, jobject clazz, jlong token)
{ {
// XXX temporary sanity check to debug crashes. // XXX temporary validation check to debug crashes.
int uid = (int)(token>>32); int uid = (int)(token>>32);
if (uid > 0 && uid < 999) { if (uid > 0 && uid < 999) {
// In Android currently there are no uids in this range. // In Android currently there are no uids in this range.

4
core/jni/android_view_InputQueue.cpp
View File

@@ -176,8 +176,8 @@ void InputQueue::enqueueEvent(InputEvent* event) {
Mutex::Autolock _l(mLock); Mutex::Autolock _l(mLock);
mPendingEvents.push(event); mPendingEvents.push(event);
if (mPendingEvents.size() == 1) { if (mPendingEvents.size() == 1) {
char dummy = 0; char payload = '\0';
int res = TEMP_FAILURE_RETRY(write(mDispatchWriteFd, &dummy, sizeof(dummy))); int res = TEMP_FAILURE_RETRY(write(mDispatchWriteFd, &payload, sizeof(payload)));
if (res < 0 && errno != EAGAIN) { if (res < 0 && errno != EAGAIN) {
ALOGW("Failed writing to dispatch fd: %s", strerror(errno)); ALOGW("Failed writing to dispatch fd: %s", strerror(errno));
} }