release-request-10d85be7-ec19-4bdb-85e6-4ae4ac39c643-for-git_oc-dr1-release-40... (d3f0a358) · Commits · e / os / android_packages_apps_Bluetooth

jni/com_android_bluetooth_btservice_AdapterService.cpp

+0 −3

Original line number	Diff line number	Diff line
		@@ -20,7 +20,6 @@
		#include "com_android_bluetooth.h"
		#include "cutils/properties.h"
		#include "hardware/bt_sock.h"
		#include "nativehelper/ScopedLocalFrame.h"
		#include "utils/Log.h"
		#include "utils/misc.h"

		@@ -162,8 +161,6 @@ static void remote_device_properties_callback(bt_status_t status,
		return;
		}

		ScopedLocalFrame local_frame(sCallbackEnv.get());

		ScopedLocalRef<jbyteArray> val(
		sCallbackEnv.get(),
		(jbyteArray)sCallbackEnv->NewByteArray(num_properties));

res/values-pt-rPT/strings.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -111,12 +111,12 @@
		<string name="outbound_noti_title" msgid="8051906709452260849">"Partilha por Bluetooth: ficheiros enviados"</string>
		<string name="inbound_noti_title" msgid="4143352641953027595">"Partilha por Bluetooth: ficheiros recebidos"</string>
		<plurals name="noti_caption_unsuccessful" formatted="false" msgid="2020750076679526122">
		<item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> unsuccessful.</item>
		<item quantity="other"><xliff:g id="UNSUCCESSFUL_NUMBER_1">%1$d</xliff:g> sem êxito.</item>
		<item quantity="one"><xliff:g id="UNSUCCESSFUL_NUMBER_0">%1$d</xliff:g> sem êxito.</item>
		</plurals>
		<plurals name="noti_caption_success" formatted="false" msgid="1572472450257645181">
		<item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> successful, %2$s</item>
		<item quantity="other"><xliff:g id="SUCCESSFUL_NUMBER_1">%1$d</xliff:g> com êxito, %2$s</item>
		<item quantity="one"><xliff:g id="SUCCESSFUL_NUMBER_0">%1$d</xliff:g> com êxito, %2$s</item>
		</plurals>
		<string name="transfer_menu_clear_all" msgid="790017462957873132">"Limpar lista"</string>
		<string name="transfer_menu_open" msgid="3368984869083107200">"Abrir"</string>

src/com/android/bluetooth/avrcp/AddressedMediaPlayer.java

+2 −4

Original line number	Diff line number	Diff line
		@@ -471,7 +471,7 @@ public class AddressedMediaPlayer {
		/* Response parameters */
		int[] attrIds = null; /* array of attr ids */
		String[] attrValues = null; /* array of attr values */
		int attrCounter = 0; /* num attributes for each item */

		/* variables to temperorily add attrs */
		ArrayList<String> attrArray = new ArrayList<String>();
		ArrayList<Integer> attrId = new ArrayList<Integer>();
		@@ -502,7 +502,6 @@ public class AddressedMediaPlayer {
		if (value != null) {
		attrArray.add(value);
		attrId.add(attrTempId.get(idx));
		attrCounter++;
		}
		}

		@@ -516,8 +515,7 @@ public class AddressedMediaPlayer {
		attrValues = attrArray.toArray(new String[attrId.size()]);

		/* create rsp object and send response */
		ItemAttrRsp rspObj = new ItemAttrRsp(AvrcpConstants.RSP_NO_ERROR,
		(byte)attrCounter, attrIds, attrValues);
		ItemAttrRsp rspObj = new ItemAttrRsp(AvrcpConstants.RSP_NO_ERROR, attrIds, attrValues);
		mMediaInterface.getItemAttrRsp(bdaddr, AvrcpConstants.RSP_NO_ERROR, rspObj);
		return;
		}

src/com/android/bluetooth/avrcp/Avrcp.java

+9 −23

Original line number	Diff line number	Diff line
		@@ -946,23 +946,20 @@ public final class Avrcp {

		private void updateCurrentMediaState() {
		MediaAttributes currentAttributes = mMediaAttributes;
		PlaybackState newState = mCurrentPlayState;
		PlaybackState newState = null;
		if (mMediaController == null) {
		// Use A2DP state if we don't have a MediaControlller
		boolean isPlaying =
		(mA2dpState == BluetoothA2dp.STATE_PLAYING) && mAudioManager.isMusicActive();
		if (isPlaying != isPlayingState(mCurrentPlayState)) {
		/* if a2dp is streaming, check to make sure music is active */
		PlaybackState.Builder builder = new PlaybackState.Builder();
		if (isPlaying) {
		builder.setState(PlaybackState.STATE_PLAYING,
		PlaybackState.PLAYBACK_POSITION_UNKNOWN, 1.0f);
		builder.setState(
		PlaybackState.STATE_PLAYING, PlaybackState.PLAYBACK_POSITION_UNKNOWN, 1.0f);
		} else {
		builder.setState(PlaybackState.STATE_PAUSED,
		PlaybackState.PLAYBACK_POSITION_UNKNOWN, 0.0f);
		builder.setState(
		PlaybackState.STATE_PAUSED, PlaybackState.PLAYBACK_POSITION_UNKNOWN, 0.0f);
		}
		newState = builder.build();
		}
		mMediaAttributes = new MediaAttributes(null);
		} else {
		newState = mMediaController.getPlaybackState();
		@@ -1570,17 +1567,6 @@ public final class Avrcp {
		playersChanged = true;
		}

		List<android.media.session.MediaController> currentControllers =
		getMediaControllers();
		for (android.media.session.MediaController controller : currentControllers) {
		if (!newControllers.contains(controller)) {
		if (DEBUG)
		Log.v(TAG, "Removing gone controller for "
		+ controller.getPackageName());
		removeMediaController(controller);
		}
		}

		if (playersChanged) {
		mHandler.sendEmptyMessage(MSG_AVAILABLE_PLAYERS_CHANGED_RSP);
		if (newControllers.size() > 0 && getAddressedPlayerInfo() == null) {

src/com/android/bluetooth/avrcp/AvrcpHelperClasses.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -185,11 +185,11 @@ class ItemAttrRsp {
		int[] mAttributesIds;
		String[] mAttributesArray;

		public ItemAttrRsp(byte status, byte numAttr, int[] attributesIds, String[] attributesArray) {
		this.mStatus = status;
		this.mNumAttr = numAttr;
		this.mAttributesIds = attributesIds;
		this.mAttributesArray = attributesArray;
		public ItemAttrRsp(byte status, int[] attributesIds, String[] attributesArray) {
		mStatus = status;
		mNumAttr = (byte) attributesIds.length;
		mAttributesIds = attributesIds;
		mAttributesArray = attributesArray;
		}
		}