Merge "[audio] Add ringer mode logging" into main (dbaa1aa9) · Commits · e / os / android_frameworks_base

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

+18 −7

Original line number	Diff line number	Diff line
		@@ -6724,22 +6724,33 @@ public class AudioService extends IAudioService.Stub
		final int ringerModeExternal = getRingerModeExternal();
		if (external) {
		setRingerModeExt(ringerMode);
		int delegateModified = ringerMode;
		if (mRingerModeDelegate != null) {
		ringerMode = mRingerModeDelegate.onSetRingerModeExternal(ringerModeExternal,
		delegateModified =
		mRingerModeDelegate.onSetRingerModeExternal(ringerModeExternal,
		ringerMode, caller, ringerModeInternal, mVolumePolicy);
		}
		if (ringerMode != ringerModeInternal) {
		setRingerModeInt(ringerMode, true /persist/);
		if (delegateModified != ringerModeInternal) {
		setRingerModeInt(delegateModified, true /persist/);
		}
		sVolumeLogger.enqueue(new EventLogger.StringEvent("setRingerMode external to "
		+ ringerMode + ", caller=" + caller
		+ ", delegateModified=" + delegateModified));

		} else /internal/ {
		if (ringerMode != ringerModeInternal) {
		setRingerModeInt(ringerMode, true /persist/);
		}
		int delegateModified = ringerMode;
		if (mRingerModeDelegate != null) {
		ringerMode = mRingerModeDelegate.onSetRingerModeInternal(ringerModeInternal,
		delegateModified =
		mRingerModeDelegate.onSetRingerModeInternal(ringerModeInternal,
		ringerMode, caller, ringerModeExternal, mVolumePolicy);
		}
		setRingerModeExt(ringerMode);
		sVolumeLogger.enqueue(new EventLogger.StringEvent("setRingerMode internal to "
		+ ringerMode + ", caller=" + caller
		+ ", delegateModified=" + delegateModified));
		setRingerModeExt(delegateModified);
		}
		}
		} finally {