Merge "updateInteropDatabase is unused" am: a713a79968 (38b5dd94) · Commits · e / os / android_packages_modules_Bluetooth

android/app/jni/com_android_bluetooth_btservice_AdapterService.cpp

+0 −23

Original line number	Diff line number	Diff line
		@@ -1546,27 +1546,6 @@ static jboolean factoryResetNative(JNIEnv* env, jobject obj) {
		return (ret == BT_STATUS_SUCCESS) ? JNI_TRUE : JNI_FALSE;
		}

		static void interopDatabaseClearNative(JNIEnv* env, jobject obj) {
		ALOGV("%s", __func__);
		if (!sBluetoothInterface) return;
		sBluetoothInterface->interop_database_clear();
		}

		static void interopDatabaseAddNative(JNIEnv* env, jobject obj, int feature,
		jbyteArray address, int length) {
		ALOGV("%s", __func__);
		if (!sBluetoothInterface) return;

		jbyte* addr = env->GetByteArrayElements(address, NULL);
		if (addr == NULL) {
		jniThrowIOException(env, EINVAL);
		return;
		}

		sBluetoothInterface->interop_database_add(feature, (RawAddress*)addr, length);
		env->ReleaseByteArrayElements(address, addr, 0);
		}

		static jbyteArray obfuscateAddressNative(JNIEnv* env, jobject obj,
		jbyteArray address) {
		ALOGV("%s", __func__);
		@@ -1721,8 +1700,6 @@ static JNINativeMethod sMethods[] = {
		(void*)dumpNative},
		{"dumpMetricsNative", "()[B", (void*)dumpMetricsNative},
		{"factoryResetNative", "()Z", (void*)factoryResetNative},
		{"interopDatabaseClearNative", "()V", (void*)interopDatabaseClearNative},
		{"interopDatabaseAddNative", "(I[BI)V", (void*)interopDatabaseAddNative},
		{"obfuscateAddressNative", "([B)[B", (void*)obfuscateAddressNative},
		{"setBufferLengthMillisNative", "(II)Z",
		(void*)setBufferLengthMillisNative},

android/app/src/com/android/bluetooth/btservice/AdapterService.java

+0 −63

Original line number	Diff line number	Diff line
		@@ -433,65 +433,6 @@ public class AdapterService extends Service {

		private final AdapterServiceHandler mHandler = new AdapterServiceHandler();

		private void updateInteropDatabase() {
		interopDatabaseClearNative();

		String interopString = Settings.Global.getString(getContentResolver(),
		Settings.Global.BLUETOOTH_INTEROPERABILITY_LIST);
		if (interopString == null) {
		return;
		}
		Log.d(TAG, "updateInteropDatabase: [" + interopString + "]");

		String[] entries = interopString.split(";");
		for (String entry : entries) {
		String[] tokens = entry.split(",");
		if (tokens.length != 2) {
		continue;
		}

		// Get feature
		int feature = 0;
		try {
		feature = Integer.parseInt(tokens[1]);
		} catch (NumberFormatException e) {
		Log.e(TAG, "updateInteropDatabase: Invalid feature '" + tokens[1] + "'");
		continue;
		}

		// Get address bytes and length
		int length = (tokens[0].length() + 1) / 3;
		if (length < 1 \|\| length > 6) {
		Log.e(TAG, "updateInteropDatabase: Malformed address string '" + tokens[0] + "'");
		continue;
		}

		byte[] addr = new byte[6];
		int offset = 0;
		for (int i = 0; i < tokens[0].length(); ) {
		if (tokens[0].charAt(i) == ':') {
		i += 1;
		} else {
		try {
		addr[offset++] = (byte) Integer.parseInt(tokens[0].substring(i, i + 2), 16);
		} catch (NumberFormatException e) {
		offset = 0;
		break;
		}
		i += 2;
		}
		}

		// Check if address was parsed ok, otherwise, move on...
		if (offset == 0) {
		continue;
		}

		// Add entry
		interopDatabaseAddNative(feature, addr, length);
		}
		}

		@Override
		public void onCreate() {
		super.onCreate();
		@@ -3948,10 +3889,6 @@ public class AdapterService extends Service {

		private native byte[] dumpMetricsNative();

		private native void interopDatabaseClearNative();

		private native void interopDatabaseAddNative(int feature, byte[] address, int length);

		private native byte[] obfuscateAddressNative(byte[] address);

		native boolean setBufferLengthMillisNative(int codec, int value);