Merge "FadeOutManager: the NPE problem due to add null value to SparseArray." into main (7c376760) · Commits · e / os / android_frameworks_base

media/java/android/media/FadeManagerConfiguration.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -673,6 +673,7 @@ public final class FadeManagerConfiguration implements Parcelable {
		return config != null ? config.getDuration() : DURATION_NOT_SET;
		}

		@Nullable
		private VolumeShaper.Configuration getVolumeShaperConfigFromWrapper(
		FadeVolumeShaperConfigsWrapper wrapper, boolean isFadeIn) {
		// if no volume shaper config is available, return null

+4 −2

Original line number	Diff line number	Diff line
		@@ -199,10 +199,12 @@ public final class FadeOutManager {
		for (AudioPlaybackConfiguration apc : players) {
		final VolumeShaper.Configuration volShaper =
		mFadeConfigurations.getFadeOutVolumeShaperConfig(apc.getAudioAttributes());
		if (volShaper != null) {
		fa.addFade(apc, /* skipRamp= */ false, volShaper);
		}
		}
		}
		}

		/**
		* Remove the app for the given UID from the list of faded out apps, unfade out its players
		@@ -249,7 +251,7 @@ public final class FadeOutManager {
		final VolumeShaper.Configuration volShaper =
		mFadeConfigurations.getFadeOutVolumeShaperConfig(apc.getAudioAttributes());
		final FadedOutApp fa = mUidToFadedAppsMap.get(apc.getClientUid());
		if (fa == null) {
		if (fa == null \|\| volShaper == null) {
		return;
		}
		fa.addFade(apc, /* skipRamp= */ true, volShaper);