Merge "AudioPolicy: better logs in AudioService history" (6d9b03e7) · Commits · e / os / android_frameworks_base

media/java/android/media/audiopolicy/AudioPolicyConfig.java

+28 −0

Original line number	Diff line number	Diff line
		@@ -220,6 +220,34 @@ public class AudioPolicyConfig implements Parcelable {
		return textDump;
		}

		/**
		* Very short dump of configuration
		* @return a condensed dump of configuration, uniquely identifies a policy in a log
		*/
		public String toCompactLogString() {
		String compactDump = "reg:" + mRegistrationId;
		int mixNum = 0;
		for (AudioMix mix : mMixes) {
		compactDump += " Mix:" + mixNum + "-Typ:" + mixTypePrefix(mix.getMixType())
		+ "-Rul:" + mix.getRule().getCriteria().size();
		mixNum++;
		}
		return compactDump;
		}

		private static String mixTypePrefix(int mixType) {
		switch (mixType) {
		case AudioMix.MIX_TYPE_PLAYERS:
		return "p";
		case AudioMix.MIX_TYPE_RECORDERS:
		return "r";
		case AudioMix.MIX_TYPE_INVALID:
		default:
		return "#";

		}
		}

		protected void reset() {
		mMixCounter = 0;
		}

services/core/java/com/android/server/audio/AudioService.java

+16 −8

Original line number	Diff line number	Diff line
		@@ -7903,9 +7903,6 @@ public class AudioService extends IAudioService.Stub
		return null;
		}

		mDynPolicyLogger.log((new AudioEventLogger.StringEvent("registerAudioPolicy for "
		+ pcb.asBinder() + " with config:" + policyConfig)).printLog(TAG));

		String regId = null;
		synchronized (mAudioPolicies) {
		if (mAudioPolicies.containsKey(pcb.asBinder())) {
		@@ -7916,6 +7913,13 @@ public class AudioService extends IAudioService.Stub
		AudioPolicyProxy app = new AudioPolicyProxy(policyConfig, pcb, hasFocusListener,
		isFocusPolicy, isTestFocusPolicy, isVolumeController, projection);
		pcb.asBinder().linkToDeath(app, 0/flags/);

		// logging after registration so we have the registration id
		mDynPolicyLogger.log((new AudioEventLogger.StringEvent("registerAudioPolicy for "
		+ pcb.asBinder() + " u/pid:" + Binder.getCallingUid() + "/"
		+ Binder.getCallingPid() + " with config:" + app.toCompactLogString()))
		.printLog(TAG));

		regId = app.getRegistrationId();
		mAudioPolicies.put(pcb.asBinder(), app);
		} catch (RemoteException e) {
		@@ -8079,7 +8083,10 @@ public class AudioService extends IAudioService.Stub
		* @param pcb nullable because on service interface
		*/
		public void unregisterAudioPolicyAsync(@Nullable IAudioPolicyCallback pcb) {
		unregisterAudioPolicy(pcb);
		if (pcb == null) {
		return;
		}
		unregisterAudioPolicyInt(pcb, "unregisterAudioPolicyAsync");
		}

		/**
		@@ -8090,12 +8097,12 @@ public class AudioService extends IAudioService.Stub
		if (pcb == null) {
		return;
		}
		unregisterAudioPolicyInt(pcb);
		unregisterAudioPolicyInt(pcb, "unregisterAudioPolicy");
		}


		private void unregisterAudioPolicyInt(@NonNull IAudioPolicyCallback pcb) {
		mDynPolicyLogger.log((new AudioEventLogger.StringEvent("unregisterAudioPolicyAsync for "
		private void unregisterAudioPolicyInt(@NonNull IAudioPolicyCallback pcb, String operationName) {
		mDynPolicyLogger.log((new AudioEventLogger.StringEvent(operationName + " for "
		+ pcb.asBinder()).printLog(TAG)));
		synchronized (mAudioPolicies) {
		AudioPolicyProxy app = mAudioPolicies.remove(pcb.asBinder());
		@@ -8570,7 +8577,8 @@ public class AudioService extends IAudioService.Stub
		}

		public void binderDied() {
		Log.i(TAG, "audio policy " + mPolicyCallback + " died");
		mDynPolicyLogger.log((new AudioEventLogger.StringEvent("AudioPolicy "
		+ mPolicyCallback.asBinder() + " died").printLog(TAG)));
		release();
		}