Merge "Add dumpsys support for bluetooth" into lmp-mr1-dev (cc633970) · Commits · e / os / android_packages_apps_Bluetooth

src/com/android/bluetooth/a2dp/A2dpService.java

+11 −0

Original line number	Diff line number	Diff line
		@@ -297,4 +297,15 @@ public class A2dpService extends ProfileService {
		return service.isA2dpPlaying(device);
		}
		};

		@Override
		public void dump(StringBuilder sb) {
		super.dump(sb);
		if (mStateMachine != null) {
		mStateMachine.dump(sb);
		}
		if (mAvrcp != null) {
		mAvrcp.dump(sb);
		}
		}
		}

src/com/android/bluetooth/a2dp/A2dpSinkService.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -210,4 +210,12 @@ public class A2dpSinkService extends ProfileService {
		return service.getAudioConfig(device);
		}
		};

		@Override
		public void dump(StringBuilder sb) {
		super.dump(sb);
		if (mStateMachine != null) {
		mStateMachine.dump(sb);
		}
		}
		}

src/com/android/bluetooth/a2dp/A2dpSinkStateMachine.java

+8 −1

Original line number	Diff line number	Diff line
		@@ -156,6 +156,13 @@ final class A2dpSinkStateMachine extends StateMachine {
		mAudioConfigs.clear();
		}

		public void dump(StringBuilder sb) {
		ProfileService.println(sb, "mCurrentDevice: " + mCurrentDevice);
		ProfileService.println(sb, "mTargetDevice: " + mTargetDevice);
		ProfileService.println(sb, "mIncomingDevice: " + mIncomingDevice);
		ProfileService.println(sb, "StateMachine: " + this.toString());
		}

		private class Disconnected extends State {
		@Override
		public void enter() {

src/com/android/bluetooth/a2dp/A2dpStateMachine.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -134,7 +134,6 @@ final class A2dpStateMachine extends StateMachine {
		mIntentBroadcastHandler = new IntentBroadcastHandler();

		mAudioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);

		}

		static A2dpStateMachine make(A2dpService svc, Context context) {
		@@ -753,6 +752,13 @@ final class A2dpStateMachine extends StateMachine {
		}
		}

		public void dump(StringBuilder sb) {
		ProfileService.println(sb, "mCurrentDevice: " + mCurrentDevice);
		ProfileService.println(sb, "mTargetDevice: " + mTargetDevice);
		ProfileService.println(sb, "mIncomingDevice: " + mIncomingDevice);
		ProfileService.println(sb, "mPlayingA2dpDevice: " + mPlayingA2dpDevice);
		ProfileService.println(sb, "StateMachine: " + this.toString());
		}

		// Event types for STACK_EVENT message
		final private static int EVENT_TYPE_NONE = 0;

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

+27 −0

Original line number	Diff line number	Diff line
		@@ -832,6 +832,33 @@ public final class Avrcp {
		mHandler.sendMessage(msg);
		}

		public void dump(StringBuilder sb) {
		sb.append("AVRCP:\n");
		ProfileService.println(sb, "mMetadata: " + mMetadata);
		ProfileService.println(sb, "mTransportControlFlags: " + mTransportControlFlags);
		ProfileService.println(sb, "mCurrentPlayState: " + mCurrentPlayState);
		ProfileService.println(sb, "mPlayStatusChangedNT: " + mPlayStatusChangedNT);
		ProfileService.println(sb, "mTrackChangedNT: " + mTrackChangedNT);
		ProfileService.println(sb, "mTrackNumber: " + mTrackNumber);
		ProfileService.println(sb, "mCurrentPosMs: " + mCurrentPosMs);
		ProfileService.println(sb, "mPlayStartTimeMs: " + mPlayStartTimeMs);
		ProfileService.println(sb, "mSongLengthMs: " + mSongLengthMs);
		ProfileService.println(sb, "mPlaybackIntervalMs: " + mPlaybackIntervalMs);
		ProfileService.println(sb, "mPlayPosChangedNT: " + mPlayPosChangedNT);
		ProfileService.println(sb, "mNextPosMs: " + mNextPosMs);
		ProfileService.println(sb, "mPrevPosMs: " + mPrevPosMs);
		ProfileService.println(sb, "mSkipStartTime: " + mSkipStartTime);
		ProfileService.println(sb, "mFeatures: " + mFeatures);
		ProfileService.println(sb, "mAbsoluteVolume: " + mAbsoluteVolume);
		ProfileService.println(sb, "mLastSetVolume: " + mLastSetVolume);
		ProfileService.println(sb, "mLastDirection: " + mLastDirection);
		ProfileService.println(sb, "mVolumeStep: " + mVolumeStep);
		ProfileService.println(sb, "mAudioStreamMax: " + mAudioStreamMax);
		ProfileService.println(sb, "mVolCmdInProgress: " + mVolCmdInProgress);
		ProfileService.println(sb, "mAbsVolRetryTimes: " + mAbsVolRetryTimes);
		ProfileService.println(sb, "mSkipAmount: " + mSkipAmount);
		}

		// Do not modify without updating the HAL bt_rc.h files.

		// match up with btrc_play_status_t enum of bt_rc.h