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

Commit 3193cb52 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update language to comply with Android's inclusive language guidance"... 

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

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

Change-Id: I5fe7ce511440e38a4e942eb5172bc7d3c27d7fc9
parents b4ea69be a4ccb877

core/jni/android_media_AudioSystem.cpp

+1 −1
Original line number Diff line number Diff line
@@ -974,7 +974,7 @@ static jint convertAudioPortConfigFromNative(JNIEnv *env, 
        if (jHandle == NULL) {

            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

        // constructed by java code with correct class type (device, mix etc...)

        // and reference to AudioPort instance in this client

core/jni/android_net_NetUtils.cpp

+3 −3
Original line number Diff line number Diff line
@@ -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)

{

    int dummy = 0;

    int optval_ignored = 0;

    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",

                "setsockopt(SO_DETACH_FILTER): %s", strerror(errno));

    }



}



static jboolean android_net_utils_bindProcessToNetwork(JNIEnv *env, jobject thiz, jint netId)

core/jni/android_os_Debug.cpp

+1 −1
Original line number Diff line number Diff line
@@ -920,7 +920,7 @@ int register_android_os_Debug(JNIEnv *env) 
{

    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");

    jint numOtherStats = env->GetStaticIntField(clazz, numOtherStats_field);

    jfieldID numDvkStats_field = env->GetStaticFieldID(clazz, "NUM_DVK_STATS", "I");

core/jni/android_os_Parcel.cpp

+1 −1
Original line number Diff line number Diff line
@@ -330,7 +330,7 @@ static jbyteArray android_os_Parcel_createByteArray(JNIEnv* env, jclass clazz, j 
    if (parcel != NULL) {

        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()) {

            ret = env->NewByteArray(len);

core/jni/android_util_Binder.cpp

+1 −1
Original line number Diff line number Diff line
@@ -962,7 +962,7 @@ static jlong android_os_Binder_clearCallingIdentity() 


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);

    if (uid > 0 && uid < 999) {

        // In Android currently there are no uids in this range.