Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99d95179 authored Dec 28, 2015 by Linux Build Service Account Committed by Gerrit - the friendly Code Review server Dec 28, 2015

Merge "MAP: Support messageListing PARAMETER_MASK_ALL_ENABLED by default."

parents 056c7ac9 deb4d767

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -2049,9 +2049,9 @@ public class BluetoothMapContent {
		* should cause all parameters to be included in the message list. */
		if(ap.getParameterMask() == BluetoothMapAppParams.INVALID_VALUE_PARAMETER \|\|
		ap.getParameterMask() == 0) {
		ap.setParameterMask(PARAMETER_MASK_DEFAULT);
		ap.setParameterMask(PARAMETER_MASK_ALL_ENABLED);
		if (V) Log.v(TAG, "msgListing(): appParameterMask is zero or not present, " +
		"changing to default: " + ap.getParameterMask());
		"changing to All Enabled by default: " + ap.getParameterMask());
		}
		if (V) Log.v(TAG, "folderElement hasSmsMmsContent = " + folderElement.hasSmsMmsContent() +
		" folderElement.hasEmailContent = " + folderElement.hasEmailContent() +

src/com/android/bluetooth/map/BluetoothMapContentEmail.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -1062,9 +1062,9 @@ public class BluetoothMapContentEmail extends BluetoothMapContent {
		* should cause all parameters to be included in the message list. */
		if(ap.getParameterMask() == BluetoothMapAppParams.INVALID_VALUE_PARAMETER \|\|
		ap.getParameterMask() == 0) {
		ap.setParameterMask(PARAMETER_MASK_DEFAULT);
		ap.setParameterMask(PARAMETER_MASK_ALL_ENABLED);
		if (V) Log.v(TAG, "msgListing(): appParameterMask is zero or not present, " +
		"changing to default: " + ap.getParameterMask());
		"changing to all enabled by default: " + ap.getParameterMask());
		}
		if (V) Log.v(TAG, "folderElement hasSmsMmsContent = " + folderElement.hasSmsMmsContent() +
		" folderElement.hasEmailContent = " + folderElement.hasEmailContent() +