Merge "[Manual] Remove empty blocks" (c1d1b485) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/avrcpcontroller/AvrcpControllerStateMachine.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -490,7 +490,7 @@ class AvrcpControllerStateMachine extends StateMachine {
	// Update the folder depth.		// Update the folder depth.
	if (mTmpIncrDirection ==		if (mTmpIncrDirection ==
	AvrcpControllerService.FOLDER_NAVIGATION_DIRECTION_UP) {		AvrcpControllerService.FOLDER_NAVIGATION_DIRECTION_UP) {
	mBrowseDepth -= 1;;		mBrowseDepth -= 1;
	} else if (mTmpIncrDirection ==		} else if (mTmpIncrDirection ==
	AvrcpControllerService.FOLDER_NAVIGATION_DIRECTION_DOWN) {		AvrcpControllerService.FOLDER_NAVIGATION_DIRECTION_DOWN) {
	mBrowseDepth += 1;		mBrowseDepth += 1;

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

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -713,10 +713,6 @@ public class BluetoothMapObexServer extends ServerRequestHandler {
	return ResponseCodes.OBEX_HTTP_UNAVAILABLE;		return ResponseCodes.OBEX_HTTP_UNAVAILABLE;
	}		}
	}		}
	if (extendedData != null) {

	}

	return ResponseCodes.OBEX_HTTP_OK;		return ResponseCodes.OBEX_HTTP_OK;
	}		}

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

+8 −8

Original line number	Original line	Diff line number	Diff line
	@@ -276,7 +276,7 @@ public abstract class BluetoothMapbMessage {
	phoneNumbers = new ArrayList<String>(1);		phoneNumbers = new ArrayList<String>(1);
	// only keep actual phone number		// only keep actual phone number
	phoneNumbers.add(subParts[subParts.length-1]);		phoneNumbers.add(subParts[subParts.length-1]);
	} else {}		}
	// Empty phone number - ignore		// Empty phone number - ignore
	}		}
	else if(line.startsWith("EMAIL:")){		else if(line.startsWith("EMAIL:")){
	@@ -287,7 +287,7 @@ public abstract class BluetoothMapbMessage {
	emailAddresses = new ArrayList<String>(1);		emailAddresses = new ArrayList<String>(1);
	// only keep actual email address		// only keep actual email address
	emailAddresses.add(subParts[subParts.length-1]);		emailAddresses.add(subParts[subParts.length-1]);
	} else {}		}
	// Empty email address entry - ignore		// Empty email address entry - ignore
	}		}
	else if(line.startsWith("X-BT-UCI:")){		else if(line.startsWith("X-BT-UCI:")){
	@@ -297,7 +297,7 @@ public abstract class BluetoothMapbMessage {
	if(btUcis == null)		if(btUcis == null)
	btUcis = new ArrayList<String>(1);		btUcis = new ArrayList<String>(1);
	btUcis.add(subParts[subParts.length-1]); // only keep actual UCI		btUcis.add(subParts[subParts.length-1]); // only keep actual UCI
	} else {}		}
	// Empty UCIentry - ignore		// Empty UCIentry - ignore
	}		}
	else if(line.startsWith("X-BT-UID:")){		else if(line.startsWith("X-BT-UID:")){
	@@ -307,7 +307,7 @@ public abstract class BluetoothMapbMessage {
	if(btUids == null)		if(btUids == null)
	btUids = new ArrayList<String>(1);		btUids = new ArrayList<String>(1);
	btUids.add(subParts[subParts.length-1]); // only keep actual UID		btUids.add(subParts[subParts.length-1]); // only keep actual UID
	} else {}		}
	// Empty UID entry - ignore		// Empty UID entry - ignore
	}		}

android/app/src/com/android/bluetooth/mapclient/obex/BmessageParser.java

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -262,6 +262,7 @@ class BmessageParser {
	prop = mParser.next();		prop = mParser.next();

	if (prop.name.equals("PARTID")) {		if (prop.name.equals("PARTID")) {
			// Do nothing
	} else if (prop.name.equals("ENCODING")) {		} else if (prop.name.equals("ENCODING")) {
	mBmsg.mBbodyEncoding = prop.value;		mBmsg.mBbodyEncoding = prop.value;