Merge "Add uid/pid to soundtrigger dumpsys sessions" into udc-qpr-dev (ab1f8f0f) · Commits · e / os / android_frameworks_base

services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java

+9 −3

Original line number	Diff line number	Diff line
		@@ -407,7 +407,9 @@ public class SoundTriggerService extends SystemService {
		var eventLogger = new EventLogger(SESSION_MAX_EVENT_SIZE,
		"SoundTriggerSessionLogs for package: "
		+ Objects.requireNonNull(originatorIdentity.packageName)
		+ "#" + sessionId);
		+ "#" + sessionId
		+ " - " + originatorIdentity.uid
		+ "\|" + originatorIdentity.pid);
		return new SoundTriggerSessionStub(client,
		newSoundTriggerHelper(moduleProperties, eventLogger), eventLogger);
		}
		@@ -428,7 +430,9 @@ public class SoundTriggerService extends SystemService {
		var eventLogger = new EventLogger(SESSION_MAX_EVENT_SIZE,
		"SoundTriggerSessionLogs for package: "
		+ Objects.requireNonNull(originatorIdentity.packageName) + "#"
		+ sessionId);
		+ sessionId
		+ " - " + originatorIdentity.uid
		+ "\|" + originatorIdentity.pid);
		return new SoundTriggerSessionStub(client,
		newSoundTriggerHelper(moduleProperties, eventLogger), eventLogger);
		}
		@@ -1801,7 +1805,9 @@ public class SoundTriggerService extends SystemService {
		ServiceEvent.Type.ATTACH, identity.packageName + "#" + sessionId));
		var eventLogger = new EventLogger(SESSION_MAX_EVENT_SIZE,
		"LocalSoundTriggerEventLogger for package: " +
		identity.packageName + "#" + sessionId);
		identity.packageName + "#" + sessionId
		+ " - " + identity.uid
		+ "\|" + identity.pid);

		return new SessionImpl(newSoundTriggerHelper(underlyingModule, eventLogger, isTrusted),
		client, eventLogger, identity);