Merge "AudioService: dump routing cache in AudioSystemAdapter" into sc-v2-dev (2969fc57) · Commits · e / os / android_frameworks_base

media/java/android/media/AudioSystem.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1317,7 +1317,7 @@ public class AudioSystem
		return DEVICE_OUT_BLE_SPEAKER_NAME;
		case DEVICE_OUT_DEFAULT:
		default:
		return Integer.toString(device);
		return "0x" + Integer.toHexString(device);
		}
		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -9035,8 +9035,6 @@ public class AudioService extends IAudioService.Stub
		protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
		if (!DumpUtils.checkDumpPermission(mContext, TAG, pw)) return;

		mAudioSystem.dump(pw);

		sLifecycleLogger.dump(pw);
		if (mAudioHandler != null) {
		pw.println("\nMessage handler (watch for unhandled messages):");
		@@ -9116,6 +9114,8 @@ public class AudioService extends IAudioService.Stub
		pw.println("mHasSpatializerEffect:" + mHasSpatializerEffect);
		pw.println("isSpatializerEnabled:" + isSpatializerEnabled());
		pw.println("isSpatialAudioEnabled:" + isSpatialAudioEnabled());

		mAudioSystem.dump(pw);
		}

		private void dumpSupportedSystemUsage(PrintWriter pw) {

+19 −2

Original line number	Diff line number	Diff line
		@@ -524,11 +524,28 @@ public class AudioSystemAdapter implements AudioSystem.RoutingUpdateCallback {
		* @param pw
		*/
		public void dump(PrintWriter pw) {
		pw.println("\nAudioSystemAdapter:");
		pw.println(" mDevicesForStreamCache:");
		if (mDevicesForStreamCache != null) {
		for (Integer stream : mDevicesForStreamCache.keySet()) {
		pw.println("\t stream:" + stream + " device:"
		+ AudioSystem.getOutputDeviceName(mDevicesForStreamCache.get(stream)));
		}
		}
		pw.println(" mDevicesForAttrCache:");
		if (mDevicesForAttrCache != null) {
		for (AudioAttributes attr : mDevicesForAttrCache.keySet()) {
		pw.println("\t" + attr);
		for (AudioDeviceAttributes devAttr : mDevicesForAttrCache.get(attr)) {
		pw.println("\t\t" + devAttr);
		}
		}
		}

		if (!ENABLE_GETDEVICES_STATS) {
		// only stats in this dump
		// only stats in the rest of this dump
		return;
		}
		pw.println("\nAudioSystemAdapter:");
		for (int i = 0; i < NB_MEASUREMENTS; i++) {
		pw.println(mMethodNames[i]
		+ ": counter=" + mMethodCallCounter[i]