Merge "[Script] Replace C-style array declarations with Java style" (d020312a) · Commits · e / os / android_packages_modules_Bluetooth

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -293,7 +293,7 @@ class PhonePolicy {
		errorLog("autoConnectHeadset, service is null");
		return;
		}
		final BluetoothDevice bondedDevices[] = mAdapterService.getBondedDevices();
		final BluetoothDevice[] bondedDevices = mAdapterService.getBondedDevices();
		if (bondedDevices == null) {
		errorLog("autoConnectHeadset, bondedDevices are null");
		return;
		@@ -313,7 +313,7 @@ class PhonePolicy {
		errorLog("autoConnectA2dp, service is null");
		return;
		}
		final BluetoothDevice bondedDevices[] = mAdapterService.getBondedDevices();
		final BluetoothDevice[] bondedDevices = mAdapterService.getBondedDevices();
		if (bondedDevices == null) {
		errorLog("autoConnectA2dp, bondedDevices are null");
		return;

android/app/src/com/android/bluetooth/gatt/AdvtFilterOnFoundOnLostInfo.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -114,7 +114,7 @@ public class AdvtFilterOnFoundOnLostInfo {

		public byte [] getResult() {
		int resultLength = mAdvPkt.length + ((mScanRsp != null) ? mScanRsp.length : 0);
		byte result[] = new byte[resultLength];
		byte[] result = new byte[resultLength];
		System.arraycopy(mAdvPkt, 0, result, 0, mAdvPkt.length);
		if (mScanRsp != null) {
		System.arraycopy(mScanRsp, 0, result, mAdvPkt.length, mScanRsp.length);

android/app/src/com/android/bluetooth/map/BluetoothMapContent.java

+13 −13

Original line number	Diff line number	Diff line
		@@ -807,7 +807,7 @@ public class BluetoothMapContent {

		StringBuilder sb = new StringBuilder();
		if (toAddress != null) {
		Rfc822Token tokens[] = Rfc822Tokenizer.tokenize(toAddress);
		Rfc822Token[] tokens = Rfc822Tokenizer.tokenize(toAddress);
		if (tokens.length != 0) {
		if(D) Log.d(TAG, "toName count= " + tokens.length);
		int i = 0;
		@@ -827,7 +827,7 @@ public class BluetoothMapContent {
		}
		}
		if (ccAddress != null) {
		Rfc822Token tokens[] = Rfc822Tokenizer.tokenize(ccAddress);
		Rfc822Token[] tokens = Rfc822Tokenizer.tokenize(ccAddress);
		if (tokens.length != 0) {
		if(D) Log.d(TAG, "ccName count= " + tokens.length);
		int i = 0;
		@@ -846,7 +846,7 @@ public class BluetoothMapContent {
		}
		}
		if (bccAddress != null) {
		Rfc822Token tokens[] = Rfc822Tokenizer.tokenize(bccAddress);
		Rfc822Token[] tokens = Rfc822Tokenizer.tokenize(bccAddress);
		if (tokens.length != 0) {
		if(D) Log.d(TAG, "bccName count= " + tokens.length);
		int i = 0;
		@@ -874,7 +874,7 @@ public class BluetoothMapContent {

		StringBuilder sb = new StringBuilder();
		if (toAddress != null) {
		Rfc822Token tokens[] = Rfc822Tokenizer.tokenize(toAddress);
		Rfc822Token[] tokens = Rfc822Tokenizer.tokenize(toAddress);
		if (tokens.length != 0) {
		if(D) Log.d(TAG, "toAddress count= " + tokens.length);
		int i = 0;
		@@ -894,7 +894,7 @@ public class BluetoothMapContent {
		}
		}
		if (ccAddress != null) {
		Rfc822Token tokens[] = Rfc822Tokenizer.tokenize(ccAddress);
		Rfc822Token[] tokens = Rfc822Tokenizer.tokenize(ccAddress);
		if (tokens.length != 0) {
		if(D) Log.d(TAG, "ccAddress count= " + tokens.length);
		int i = 0;
		@@ -913,7 +913,7 @@ public class BluetoothMapContent {
		}
		}
		if (bccAddress != null) {
		Rfc822Token tokens[] = Rfc822Tokenizer.tokenize(bccAddress);
		Rfc822Token[] tokens = Rfc822Tokenizer.tokenize(bccAddress);
		if (tokens.length != 0) {
		if(D) Log.d(TAG, "bccAddress count= " + tokens.length);
		int i = 0;
		@@ -1040,7 +1040,7 @@ public class BluetoothMapContent {
		} else if (fi.mMsgType == FilterInfo.TYPE_EMAIL/* \|\|
		fi.mMsgType == FilterInfo.TYPE_IM*/) {
		String nameEmail = c.getString(fi.mMessageColFromAddress);
		Rfc822Token tokens[] = Rfc822Tokenizer.tokenize(nameEmail);
		Rfc822Token[] tokens = Rfc822Tokenizer.tokenize(nameEmail);
		if (tokens.length != 0) {
		if(D) Log.d(TAG, "Originator count= " + tokens.length);
		int i = 0;
		@@ -1111,7 +1111,7 @@ public class BluetoothMapContent {
		} else if (fi.mMsgType == FilterInfo.TYPE_EMAIL/* \|\|
		fi.mMsgType == FilterInfo.TYPE_IM*/) {
		String nameEmail = c.getString(fi.mMessageColFromAddress);
		Rfc822Token tokens[] = Rfc822Tokenizer.tokenize(nameEmail);
		Rfc822Token[] tokens = Rfc822Tokenizer.tokenize(nameEmail);
		if (tokens.length != 0) {
		if(D) Log.d(TAG, "Originator count= " + tokens.length);
		int i = 0;
		@@ -1360,7 +1360,7 @@ public class BluetoothMapContent {
		}
		if (V) Log.v(TAG, "recipientIds with spaces: "+ recipientIds +"\n");
		if(recipientIds != null) {
		String recipients[] = null;
		String[] recipients = null;
		whereClause = "";
		recipients = recipientIds.split(" ");
		for (String id: recipients) {
		@@ -3809,7 +3809,7 @@ public class BluetoothMapContent {
		// Set recipient:
		String nameEmail = c.getString(
		c.getColumnIndex(BluetoothMapContract.MessageColumns.TO_LIST));
		Rfc822Token tokens[] = Rfc822Tokenizer.tokenize(nameEmail);
		Rfc822Token[] tokens = Rfc822Tokenizer.tokenize(nameEmail);
		if (tokens.length != 0) {
		if(D) Log.d(TAG, "Recipient count= " + tokens.length);
		int i = 0;
		@@ -3971,13 +3971,13 @@ public class BluetoothMapContent {
		if(contacts != null && contacts.moveToFirst()){
		String name = contacts.getString(contacts.getColumnIndex(
		BluetoothMapContract.ConvoContactColumns.NAME));
		String btUid[] = new String[1];
		String[] btUid = new String[1];
		btUid[0]= contacts.getString(contacts.getColumnIndex(
		BluetoothMapContract.ConvoContactColumns.X_BT_UID));
		String nickname = contacts.getString(contacts.getColumnIndex(
		BluetoothMapContract.ConvoContactColumns.NICKNAME));
		String btUci[] = new String[1];
		String btOwnUci[] = new String[1];
		String[] btUci = new String[1];
		String[] btOwnUci = new String[1];
		btOwnUci[0] = mAccount.getUciFull();
		btUci[0] = contacts.getString(contacts.getColumnIndex(
		BluetoothMapContract.ConvoContactColumns.UCI));

android/app/src/com/android/bluetooth/map/BluetoothMapContentObserver.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -2475,7 +2475,7 @@ public class BluetoothMapContentObserver {
		if (V) {
		int length = msgBody.length();
		Log.v(TAG, "pushMessage: message string length = " + length);
		String messages[] = msgBody.split("\r\n");
		String[] messages = msgBody.split("\r\n");
		Log.v(TAG, "pushMessage: messages count=" + messages.length);
		for(int i = 0; i < messages.length; i++) {
		Log.v(TAG, "part " + i + ":" + messages[i]);

android/app/src/com/android/bluetooth/map/BluetoothMapUtils.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -368,7 +368,7 @@ public class BluetoothMapUtils {
		if(text == null) {
		return "";
		}
		char out[] = new char[text.length()];
		char[] out = new char[text.length()];
		int i, o, l;
		for(i=0, o=0, l=text.length(); i<l; i++){
		char c = text.charAt(i);