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

+0 −4

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

		}

		return ResponseCodes.OBEX_HTTP_OK;
		}

+8 −8

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

+1 −0

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

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