Merge "bluetooth: prevent Android restart with buggy devices" into jellybean (487fa765) · Commits · e / os / android_frameworks_base

core/java/android/server/BluetoothDeviceProperties.java

+29 −8

Original line number	Diff line number	Diff line
		@@ -58,16 +58,37 @@ class BluetoothDeviceProperties {
		}
		if (name.equals("UUIDs") \|\| name.equals("Nodes")) {
		StringBuilder str = new StringBuilder();
		len = Integer.valueOf(properties[++i]);
		i++;
		if (i < properties.length) {
		len = Integer.valueOf(properties[i]);
		for (int j = 0; j < len; j++) {
		str.append(properties[++i]);
		i++;
		if (i < properties.length) {
		str.append(properties[i]);
		str.append(",");
		} else {
		Log.e(TAG, "Error: Remote Device Property Value at index "
		+ i + " is missing");
		continue;
		}
		}
		if (len > 0) {
		newValue = str.toString();
		}
		} else {
		newValue = properties[++i];
		Log.e(TAG, "Error: Remote Device Property Value at index "
		+ i + " is missing");
		continue;
		}
		} else {
		i++;
		if (i < properties.length) {
		newValue = properties[i];
		} else {
		Log.e(TAG, "Error: Remote Device Property Value at index "
		+ i + " is missing");
		continue;
		}
		}

		propertyValues.put(name, newValue);