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

Commit b32b1ddf authored by Brian Carlstrom's avatar Brian Carlstrom
Browse files

Fix usages of PopLocalFrame to include returned local reference 

Change-Id: Ibd7a37b4035862718cb625110cfbba741537c17a
parent 42bc0e94

core/java/android/server/BluetoothAdapterProperties.java

+1 −2
Original line number Diff line number Diff line
@@ -76,14 +76,13 @@ class BluetoothAdapterProperties { 
        for (int i = 0; i < properties.length; i++) {

            String name = properties[i];

            String newValue = null;

            int len;

            if (name == null) {

                Log.e(TAG, "Error:Adapter Property at index " + i + " is null");

                continue;

            }

            if (name.equals("Devices") || name.equals("UUIDs")) {

                StringBuilder str = new StringBuilder();

                len = Integer.valueOf(properties[++i]);

                int len = Integer.valueOf(properties[++i]);

                for (int j = 0; j < len; j++) {

                    str.append(properties[++i]);

                    str.append(",");

core/jni/android_server_BluetoothService.cpp

+2 −5
Original line number Diff line number Diff line
@@ -695,9 +695,7 @@ static jobjectArray getDevicePropertiesNative(JNIEnv *env, jobject object, 
           str_array =  parse_remote_device_properties(env, &iter);

        dbus_message_unref(reply);



        env->PopLocalFrame(NULL);



        return str_array;

        return (jobjectArray) env->PopLocalFrame(str_array);

    }

#endif

    return NULL;
@@ -731,8 +729,7 @@ static jobjectArray getAdapterPropertiesNative(JNIEnv *env, jobject object) { 
            str_array = parse_adapter_properties(env, &iter);

        dbus_message_unref(reply);



        env->PopLocalFrame(NULL);

        return str_array;

        return (jobjectArray) env->PopLocalFrame(str_array);

    }

#endif

    return NULL;